aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2007-10-05 16:17:58 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 18:03:17 -0400
commit7f785763660e75c9eddaddea3d618696af4ae3a2 (patch)
tree4538775b2b0f05d77509dd2b6b91ba9e6429154c /drivers/pci/pci.c
parentfd6e732186ab522c812ab19c2c5e5befb8ec8115 (diff)
pci: implement "pci=noaer"
For cases in which CONFIG_PCIEAER=y (such as distro kernels), allow users to disable PCIE Advanced Error Reporting by using "pci=noaer" on the kernel command line. This can be used to work around hardware or (kernel) software problems. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 19a64a36ecab..2dd5c282fabe 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1586,6 +1586,8 @@ static int __devinit pci_setup(char *str)
1586 if (*str && (str = pcibios_setup(str)) && *str) { 1586 if (*str && (str = pcibios_setup(str)) && *str) {
1587 if (!strcmp(str, "nomsi")) { 1587 if (!strcmp(str, "nomsi")) {
1588 pci_no_msi(); 1588 pci_no_msi();
1589 } else if (!strcmp(str, "noaer")) {
1590 pci_no_aer();
1589 } else if (!strncmp(str, "cbiosize=", 9)) { 1591 } else if (!strncmp(str, "cbiosize=", 9)) {
1590 pci_cardbus_io_size = memparse(str + 9, &str); 1592 pci_cardbus_io_size = memparse(str + 9, &str);
1591 } else if (!strncmp(str, "cbmemsize=", 10)) { 1593 } else if (!strncmp(str, "cbmemsize=", 10)) {