Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217370
b: refs/heads/master
c: 54a08ab
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Oct 24, 2010
1 parent 6cf6bc1 commit 8d64518
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 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: accf74fff36315a31dc7319dae2927af06e9296f
refs/heads/master: 54a08ab153cf38a08ccce7544d58c819ad02dd18
7 changes: 6 additions & 1 deletion trunk/drivers/edac/i7core_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ static LIST_HEAD(i7core_edac_list);
static DEFINE_MUTEX(i7core_edac_lock);
static int probed;

static int use_pci_fixup;
module_param(use_pci_fixup, int, 0444);
MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices");
/*
* This is used for Nehalem-EP and Nehalem-EX devices, where the non-core
* registers start at bus 255, and are not reported by BIOS.
Expand Down Expand Up @@ -1257,6 +1260,7 @@ static void __init i7core_xeon_pci_fixup(const struct pci_id_table *table)
{
struct pci_dev *pdev = NULL;
int i;

/*
* On Xeon 55xx, the Intel Quckpath Arch Generic Non-core pci buses
* aren't announced by acpi. So, we need to use a legacy scan probing
Expand Down Expand Up @@ -2126,7 +2130,8 @@ static int __init i7core_init(void)
/* Ensure that the OPSTATE is set correctly for POLL or NMI */
opstate_init();

i7core_xeon_pci_fixup(pci_dev_table);
if (use_pci_fixup)
i7core_xeon_pci_fixup(pci_dev_table);

pci_rc = pci_register_driver(&i7core_driver);

Expand Down

0 comments on commit 8d64518

Please sign in to comment.