diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-02-23 19:23:30 -0800 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-24 08:47:42 -0800 |
commit | b55438fdd5173a367659a7e200acea6c9f77b8cb (patch) | |
tree | fbcb4ac2e03abcf6933b18fce56361adbcda84af /drivers/pci/pci.c | |
parent | 0c5be0cb0edfe3b5c4b62eac68aa2aa15ec681af (diff) | |
download | linux-3.10-b55438fdd5173a367659a7e200acea6c9f77b8cb.tar.gz linux-3.10-b55438fdd5173a367659a7e200acea6c9f77b8cb.tar.bz2 linux-3.10-b55438fdd5173a367659a7e200acea6c9f77b8cb.zip |
PCI: prepare pci=realloc for multiple options
Let the user could enable and disable with pci=realloc=on or pci=realloc=off
Also
1. move variable and functions near the place they are used.
2. change macro to function
3. change related functions and variable to static and _init
4. update parameter description accordingly.
This will let us add a config option to control default behavior, and
still allow the user to turn off automatic reallocation if it fails on
their platform until a permanent solution is found.
-v2: still honor pci=realloc, and treat it as pci=realloc=on
also use enum instead of ...
-v3: update kernel-paramenters.txt according to Jesse.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 8f30736dbf3..e9f9dc183cf 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3772,8 +3772,10 @@ static int __init pci_setup(char *str) pci_no_msi(); } else if (!strcmp(str, "noaer")) { pci_no_aer(); + } else if (!strncmp(str, "realloc=", 8)) { + pci_realloc_get_opt(str + 8); } else if (!strncmp(str, "realloc", 7)) { - pci_realloc(); + pci_realloc_get_opt("on"); } else if (!strcmp(str, "nodomains")) { pci_no_domains(); } else if (!strncmp(str, "cbiosize=", 9)) { |