Messages in this thread Patch in this message | | | Date | Tue, 13 Mar 2018 08:44:49 -0500 | From | "Gustavo A. R. Silva" <> | Subject | [PATCH v3] EDAC, sb_edac: Remove VLA usage |
| |
In preparation to enabling -Wvla, remove VLA and replace it with a fixed-length array instead.
Fixed as part of the directive to remove all VLAs from the kernel: https://lkml.org/lkml/2018/3/7/621
Reviewed-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- Changes in v3: - Update macro MAX_INTERLEAVE in order to avoid too long lines. This change is based on Mauro's feedback. - Update changelog with Mauro's Reviewed-by.
Changes in v2: - Use macro max_t to compute the max of all three array sizes. This change is based on Borislav's feedback.
drivers/edac/sb_edac.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 8721002..aff4778 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -110,6 +110,11 @@ static const u32 knl_interleave_list[] = { 0xdc, 0xe4, 0xec, 0xf4, 0xfc, /* 15-19 */ 0x104, 0x10c, 0x114, 0x11c, /* 20-23 */ }; +#define MAX_INTERLEAVE \ + (max_t(unsigned int, ARRAY_SIZE(sbridge_interleave_list), \ + max_t(unsigned int, ARRAY_SIZE(ibridge_interleave_list), \ + ARRAY_SIZE(knl_interleave_list)))) + struct interleave_pkg { unsigned char start; @@ -1899,7 +1904,7 @@ static int get_memory_error_data(struct mem_ctl_info *mci, int n_rir, n_sads, n_tads, sad_way, sck_xch; int sad_interl, idx, base_ch; int interleave_mode, shiftup = 0; - unsigned sad_interleave[pvt->info.max_interleave]; + unsigned int sad_interleave[MAX_INTERLEAVE]; u32 reg, dram_rule; u8 ch_way, sck_way, pkg, sad_ha = 0; u32 tad_offset; -- 2.7.4
| |