diff options
author | Konstantin Olifer <kolifer@gmail.com> | 2010-03-10 18:23:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:40 -0500 |
commit | 8de5c1a165be5624a1003ce17877299e04b2afd6 (patch) | |
tree | 3f85e6045500d60a3309cf567c46ba352fedd5ba /drivers/edac | |
parent | 66ed3f7516da31205aed9b47a13348c0d982c4f5 (diff) |
edac: e752x fsb ecc
FSB parity is only supported on the Xeon processor. Previously it was
incorrectly enabled for the Celeron as well.
Signed-off-by: Konstantin Olifer <kolifer@gmail.com>
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Cc: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/edac')
-rw-r--r-- | drivers/edac/e752x_edac.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index d205d493a68a..795fcd1eec1c 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c | |||
@@ -1073,10 +1073,7 @@ fail: | |||
1073 | 1073 | ||
1074 | /* Setup system bus parity mask register. | 1074 | /* Setup system bus parity mask register. |
1075 | * Sysbus parity supported on: | 1075 | * Sysbus parity supported on: |
1076 | * e7320/e7520/e7525 + Xeon | 1076 | * e7320/e7520/e7525 + Xeon |
1077 | * i3100 + Xeon/Celeron | ||
1078 | * Sysbus parity not supported on: | ||
1079 | * i3100 + Pentium M/Celeron M/Core Duo/Core2 Duo | ||
1080 | */ | 1077 | */ |
1081 | static void e752x_init_sysbus_parity_mask(struct e752x_pvt *pvt) | 1078 | static void e752x_init_sysbus_parity_mask(struct e752x_pvt *pvt) |
1082 | { | 1079 | { |
@@ -1087,10 +1084,7 @@ static void e752x_init_sysbus_parity_mask(struct e752x_pvt *pvt) | |||
1087 | /* Allow module parameter override, else see if CPU supports parity */ | 1084 | /* Allow module parameter override, else see if CPU supports parity */ |
1088 | if (sysbus_parity != -1) { | 1085 | if (sysbus_parity != -1) { |
1089 | enable = sysbus_parity; | 1086 | enable = sysbus_parity; |
1090 | } else if (cpu_id[0] && | 1087 | } else if (cpu_id[0] && !strstr(cpu_id, "Xeon")) { |
1091 | ((strstr(cpu_id, "Pentium") && strstr(cpu_id, " M ")) || | ||
1092 | (strstr(cpu_id, "Celeron") && strstr(cpu_id, " M ")) || | ||
1093 | (strstr(cpu_id, "Core") && strstr(cpu_id, "Duo")))) { | ||
1094 | e752x_printk(KERN_INFO, "System Bus Parity not " | 1088 | e752x_printk(KERN_INFO, "System Bus Parity not " |
1095 | "supported by CPU, disabling\n"); | 1089 | "supported by CPU, disabling\n"); |
1096 | enable = 0; | 1090 | enable = 0; |