diff options
| author | Ram Pai <linuxram@us.ibm.com> | 2011-07-07 20:19:10 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-07-09 00:49:20 +0200 |
| commit | f483d3923dc3a6394c483e28ccb3fe700bdf399e (patch) | |
| tree | ef487babd0ef104e1fa8323c23050d66096c0f3a /drivers/pci/pci.c | |
| parent | Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
| download | linux-f483d3923dc3a6394c483e28ccb3fe700bdf399e.tar.xz linux-f483d3923dc3a6394c483e28ccb3fe700bdf399e.zip | |
PCI: conditional resource-reallocation through kernel parameter pci=realloc
Multiple attempts to dynamically reallocate pci resources have
unfortunately lead to regressions. Though we continue to fix the
regressions and fine tune the dynamic-reallocation behavior, we have not
reached a acceptable state yet.
This patch provides a interim solution. It disables dynamic reallocation
by default, but adds the ability to enable it through pci=realloc kernel
command line parameter.
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 2c5b9b991279..692671b11667 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3483,6 +3483,8 @@ static int __init pci_setup(char *str) pci_no_msi(); } else if (!strcmp(str, "noaer")) { pci_no_aer(); + } else if (!strncmp(str, "realloc", 7)) { + pci_realloc(); } else if (!strcmp(str, "nodomains")) { pci_no_domains(); } else if (!strncmp(str, "cbiosize=", 9)) { |