diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:58 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:58 -0500 |
commit | 3c13be017abe041e495862d50dbd83093e09cd6a (patch) | |
tree | 54f430a5df0d835950430b7199633cc578041c32 /arch/powerpc/platforms/pseries | |
parent | 14be538c566f6fd6f8c8abd1687aa5d36a600703 (diff) |
powerpc/PCI: make pci_probe_only default to 0
pci_probe_only is set on ppc64 to prevent resource re-allocation
by the core. It's meant to be used in very specific circumstances
such as when operating under a hypervisor that may prevent such
re-allocation.
Instead of default to 1, we make it default to 0 and explicitly
set it in the few cases where we need it.
This fixes FSL PCI which wants it clear among others.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/powerpc/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index f79f1278dfc..386e2656c23 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -380,6 +380,9 @@ static void __init pSeries_setup_arch(void) | |||
380 | 380 | ||
381 | fwnmi_init(); | 381 | fwnmi_init(); |
382 | 382 | ||
383 | /* By default, only probe PCI (can be overriden by rtas_pci */ | ||
384 | pci_probe_only = 1; | ||
385 | |||
383 | /* Find and initialize PCI host bridges */ | 386 | /* Find and initialize PCI host bridges */ |
384 | init_pci_config_tokens(); | 387 | init_pci_config_tokens(); |
385 | find_and_init_phbs(); | 388 | find_and_init_phbs(); |