From 9811b995962abb5c402b3cc9cc57345ba1e78456 Mon Sep 17 00:00:00 2001 From: Konstantin Olifer Date: Wed, 10 Mar 2010 15:23:14 -0800 Subject: [PATCH] --- yaml --- r: 187263 b: refs/heads/master c: 8de5c1a165be5624a1003ce17877299e04b2afd6 h: refs/heads/master i: 187261: 52df9e225b2415ce03d93b6c549efb41be30e3fb 187259: 7dd423c92e424eed57e96d535ec13ac25cceb2f8 187255: d6fcf108bf0d586013a3ee0f1b5d8c58367c6053 187247: c0a9b8dc055fe953e0a6ee2706ec3418107ff4fa 187231: ac9cb147eba4c7b23dfa8ae0573909dec010df5f 187199: d69791ec55eaafc4bf6b1cddb7a4cf3aab3d369e 187135: 4abfb741a610b6be63cec9a76d5805bb8a9c8e21 v: v3 --- [refs] | 2 +- trunk/drivers/edac/e752x_edac.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 287829f17fd8..21879f5a2277 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66ed3f7516da31205aed9b47a13348c0d982c4f5 +refs/heads/master: 8de5c1a165be5624a1003ce17877299e04b2afd6 diff --git a/trunk/drivers/edac/e752x_edac.c b/trunk/drivers/edac/e752x_edac.c index d205d493a68a..795fcd1eec1c 100644 --- a/trunk/drivers/edac/e752x_edac.c +++ b/trunk/drivers/edac/e752x_edac.c @@ -1073,10 +1073,7 @@ static int e752x_get_devs(struct pci_dev *pdev, int dev_idx, /* Setup system bus parity mask register. * Sysbus parity supported on: - * e7320/e7520/e7525 + Xeon - * i3100 + Xeon/Celeron - * Sysbus parity not supported on: - * i3100 + Pentium M/Celeron M/Core Duo/Core2 Duo + * e7320/e7520/e7525 + Xeon */ static void e752x_init_sysbus_parity_mask(struct e752x_pvt *pvt) { @@ -1087,10 +1084,7 @@ static void e752x_init_sysbus_parity_mask(struct e752x_pvt *pvt) /* Allow module parameter override, else see if CPU supports parity */ if (sysbus_parity != -1) { enable = sysbus_parity; - } else if (cpu_id[0] && - ((strstr(cpu_id, "Pentium") && strstr(cpu_id, " M ")) || - (strstr(cpu_id, "Celeron") && strstr(cpu_id, " M ")) || - (strstr(cpu_id, "Core") && strstr(cpu_id, "Duo")))) { + } else if (cpu_id[0] && !strstr(cpu_id, "Xeon")) { e752x_printk(KERN_INFO, "System Bus Parity not " "supported by CPU, disabling\n"); enable = 0;