Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3011b20da9d60b8168ead403e6aa860d0d8d11e4

Authored by Borislav Petkov
1 parent 0eca52a927
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

amd64_edac: fix driver instance lookup table allocation 

Allocate memory statically for 8-node machines max for simplicity
instead of relying on MAX_NUMNODES which is 0 on !CONFIG_NUMA builds.

Spotted by Jan Beulich.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>

Showing 2 changed files with 4 additions and 2 deletions Side-by-side Diff

drivers/edac/amd64_edac.c
Diff comments   View file @ 3011b20
... ... @@ -15,8 +15,8 @@
15 15  
16 16 /* Lookup table for all possible MC control instances */
17 17 struct amd64_pvt;
18   -static struct mem_ctl_info *mci_lookup[MAX_NUMNODES];
19   -static struct amd64_pvt *pvt_lookup[MAX_NUMNODES];
  18 +static struct mem_ctl_info *mci_lookup[EDAC_MAX_NUMNODES];
  19 +static struct amd64_pvt *pvt_lookup[EDAC_MAX_NUMNODES];
20 20  
21 21 /*
22 22 * See F2x80 for K8 and F2x[1,0]80 for Fam10 and later. The table below is only
drivers/edac/amd64_edac.h
Diff comments   View file @ 3011b20
... ... @@ -132,6 +132,8 @@
132 132 #define EDAC_AMD64_VERSION " Ver: 3.2.0 " __DATE__
133 133 #define EDAC_MOD_STR "amd64_edac"
134 134  
  135 +#define EDAC_MAX_NUMNODES 8
  136 +
135 137 /* Extended Model from CPUID, for CPU Revision numbers */
136 138 #define OPTERON_CPU_LE_REV_C 0
137 139 #define OPTERON_CPU_REV_D 1