Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187263
b: refs/heads/master
c: 8de5c1a
h: refs/heads/master
i:
  187261: 52df9e2
  187259: 7dd423c
  187255: d6fcf10
  187247: c0a9b8d
  187231: ac9cb14
  187199: d69791e
  187135: 4abfb74
v: v3
  • Loading branch information
Konstantin Olifer authored and Linus Torvalds committed Mar 12, 2010
1 parent e0427d2 commit 9811b99
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 66ed3f7516da31205aed9b47a13348c0d982c4f5
refs/heads/master: 8de5c1a165be5624a1003ce17877299e04b2afd6
10 changes: 2 additions & 8 deletions trunk/drivers/edac/e752x_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
Expand Down

0 comments on commit 9811b99

Please sign in to comment.