aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-07-11 12:14:27 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-11 21:22:57 +0200
commit060b9708a0c04cf9af69c128ef7954b6f0a84180 (patch)
tree0837ee2b02484d7618c4668fe0d5f4464e66ff38 /arch/x86/pci
parent2510495e208e7a69b64fcf5cdf8966d873536d9e (diff)
x86/pci: Changing subsystem initialization order for NUMA
Cc: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Robert Richter <robert.richter@amd.com> Cc: Robert Richter <robert.richter@amd.com> Cc: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/legacy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index 132876cc6fc..60e8caa1356 100644
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -57,14 +57,14 @@ static int __init pci_legacy_init(void)
int __init pci_subsys_init(void)
{
+#ifdef CONFIG_X86_NUMAQ
+ pci_numa_init();
+#endif
#ifdef CONFIG_ACPI
pci_acpi_init();
#endif
pci_legacy_init();
pcibios_irq_init();
-#ifdef CONFIG_X86_NUMAQ
- pci_numa_init();
-#endif
pcibios_init();
return 0;