diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2018-03-08 15:52:08 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-08 15:52:08 +0100 |
commit | 422caa5f7a455920369039d04c6070eb50d6146b (patch) | |
tree | 8667d9587c412ee25660184f6e943ed10e445bc0 /drivers/edac | |
parent | x86/mce/AMD: Carve out SMCA get_block_address() code (diff) | |
parent | x86/MCE: Serialize sysfs changes (diff) | |
download | linux-422caa5f7a455920369039d04c6070eb50d6146b.tar.xz linux-422caa5f7a455920369039d04c6070eb50d6146b.zip |
Merge branch 'ras/urgent' into ras/core
Pick up urgent fixes to apply further development changes.
Diffstat (limited to 'drivers/edac')
-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 */ |