diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-26 10:19:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-26 10:19:15 -0800 |
| commit | 4c3579f6cadd5eb8250a36e789e6df66f660237a (patch) | |
| tree | 301d4f88756870efec298bf946ca6ece68774ac3 | |
| parent | 85a2d939c05965ab9e849735436a3c8d3538dc75 (diff) | |
| parent | bf8486709ac7fad99e4040dea73fe466c57a4ae1 (diff) | |
| download | linux-4c3579f6cadd5eb8250a36e789e6df66f660237a.tar.bz2 | |
Merge tag 'edac_fixes_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC fix from Borislav Petkov:
"sb_edac: Prevent memory corruption on KNL (from Anna Karbownik)"
* tag 'edac_fixes_for_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
EDAC, sb_edac: Fix out of bound writes during DIMM configuration on KNL
| -rw-r--r-- | drivers/edac/sb_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index f34430f99fd8..872100215ca0 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -279,7 +279,7 @@ static const u32 correrrthrsld[] = { * sbridge structs */ -#define NUM_CHANNELS 4 /* Max channels per MC */ +#define NUM_CHANNELS 6 /* Max channels per MC */ #define MAX_DIMMS 3 /* Max DIMMS per channel */ #define KNL_MAX_CHAS 38 /* KNL max num. of Cache Home Agents */ #define KNL_MAX_CHANNELS 6 /* KNL max num. of PCI channels */ |