From: Robert Richter <robert.richter@amd.com>
Date: Fri, 11 Jul 2008 10:14:27 +0000 (+0200)
Subject: x86/pci: Changing subsystem initialization order for NUMA
X-Git-Tag: v2.6.27-rc1~955^2~1^17~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=060b9708a0c04cf9af69c128ef7954b6f0a84180;p=linux-2.6

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>
---

diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index 132876cc6f..60e8caa135 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;