From 1e77005bd7f2f3b992c62e24c7e1324db7bcd028 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Thu, 10 Jul 2008 18:58:24 +0200
Subject: [PATCH] --- yaml --- r: 100154 b: refs/heads/master c:
 3f68f7d945e37e4d4bf1da445a285c59a6185815 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86/pci/legacy.c |  3 +++
 trunk/arch/x86/pci/numa.c   | 10 +---------
 trunk/arch/x86/pci/pci.h    |  1 +
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 27f6a0e54ad1..017bf86f8c64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15e551d25e5a600c76cb92171357d4cbe2d1bf7a
+refs/heads/master: 3f68f7d945e37e4d4bf1da445a285c59a6185815
diff --git a/trunk/arch/x86/pci/legacy.c b/trunk/arch/x86/pci/legacy.c
index 3c1d795cbbe9..d8b6e928590b 100644
--- a/trunk/arch/x86/pci/legacy.c
+++ b/trunk/arch/x86/pci/legacy.c
@@ -62,6 +62,9 @@ int __init pci_subsys_init(void)
 #endif
 	pci_legacy_init();
 	pcibios_irq_init();
+#ifdef CONFIG_X86_NUMAQ
+	pci_numa_init();
+#endif
 	pcibios_init();
 }
 subsys_initcall(pci_subsys_init);
diff --git a/trunk/arch/x86/pci/numa.c b/trunk/arch/x86/pci/numa.c
index e1620dc8649a..8b5ca1966731 100644
--- a/trunk/arch/x86/pci/numa.c
+++ b/trunk/arch/x86/pci/numa.c
@@ -151,7 +151,7 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx);
 
-static int __init pci_numa_init(void)
+int __init pci_numa_init(void)
 {
 	int quad;
 
@@ -176,11 +176,3 @@ static int __init pci_numa_init(void)
 		}
 	return 0;
 }
-
-static __init int pci_subsys_init(void)
-{
-	pci_numa_init();
-	pcibios_irq_init();
-	pcibios_init();
-}
-subsys_initcall(pci_subsys_init);
diff --git a/trunk/arch/x86/pci/pci.h b/trunk/arch/x86/pci/pci.h
index 58241748470f..b2270a55b0cf 100644
--- a/trunk/arch/x86/pci/pci.h
+++ b/trunk/arch/x86/pci/pci.h
@@ -107,6 +107,7 @@ extern void __init dmi_check_skip_isa_align(void);
 /* some common used subsys_initcalls */
 extern int __init pci_acpi_init(void);
 extern int __init pcibios_irq_init(void);
+extern int __init pci_numa_init(void);
 extern int __init pcibios_init(void);
 
 /* pci-mmconfig.c */