x86/pci merge: fixing numaq initialization

Patch d49c4288 (tip/x86/mpparse) introduced some changes in calling
subsys_init calls if CONFIG_X86_NUMAQ option is set. This patch
updates subsystem initalization according to this changes.
Signed-off-by: NRobert Richter <robert.richter@amd.com>
Cc: Robert Richter <robert.richter@amd.com>
Signed-off-by: NIngo Molnar <mingo@elte.hu>

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

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

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