8 files changed, 18 insertions, 40 deletions

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 621eac56955..febd69dbbee 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -265,7 +265,11 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
         memcpy(str, m->mpc_bustype, 6);
         str[6] = 0;
 
+#ifdef CONFIG_X86_NUMAQ
         mpc_oem_bus_info(m, str, translation_table[mpc_record]);
+#else
+        Dprintk("Bus #%d is %s\n", m->mpc_busid, str);
+#endif
 
 #if MAX_MP_BUSSES < 256
         if (m->mpc_busid >= MAX_MP_BUSSES) {
diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c
index a98ae0e5727..d9afbae5092 100644
--- a/arch/x86/pci/numa.c
+++ b/arch/x86/pci/numa.c
@@ -17,6 +17,18 @@ int mp_bus_id_to_node[MAX_MP_BUSSES];
 int mp_bus_id_to_local[MAX_MP_BUSSES];
 #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
 
+void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
+        struct mpc_config_translation *translation)
+{
+        int quad = translation->trans_quad;
+        int local = translation->trans_local;
+
+        mp_bus_id_to_node[m->mpc_busid] = quad;
+        mp_bus_id_to_local[m->mpc_busid] = local;
+        printk(KERN_INFO "Bus #%d is %s (node %d)\n",
+               m->mpc_busid, name, quad);
+}
+
 int quad_local_to_mp_bus_id [NR_CPUS/4][4];
 #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
 void mpc_oem_pci_bus(struct mpc_config_bus *m,
diff --git a/include/asm-x86/genapic_32.h b/include/asm-x86/genapic_32.h
index 5a1ae0164aa..5a1b68ac3ca 100644
--- a/include/asm-x86/genapic_32.h
+++ b/include/asm-x86/genapic_32.h
@@ -48,9 +48,6 @@ struct genapic {
         u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);
 
         /* mpparse */
-        void (*mpc_oem_bus_info)(struct mpc_config_bus *, char *, 
-                                 struct mpc_config_translation *);
-
         /* When one of the next two hooks returns 1 the genapic
            is switched to this. Essentially they are additional probe 
            functions. */
@@ -103,7 +100,6 @@ struct genapic {
         APICFUNC(apicid_to_cpu_present) \
         APICFUNC(setup_portio_remap) \
         APICFUNC(check_phys_apicid_present) \
-        APICFUNC(mpc_oem_bus_info) \
         APICFUNC(mps_oem_check) \
         APICFUNC(get_apic_id) \
         .apic_id_mask = APIC_ID_MASK, \
diff --git a/include/asm-x86/mach-default/mach_mpparse.h b/include/asm-x86/mach-default/mach_mpparse.h
index 679393c26dc..d14108505bb 100644
--- a/include/asm-x86/mach-default/mach_mpparse.h
+++ b/include/asm-x86/mach-default/mach_mpparse.h
@@ -1,12 +1,6 @@
 #ifndef __ASM_MACH_MPPARSE_H
 #define __ASM_MACH_MPPARSE_H
 
-static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, 
-                                struct mpc_config_translation *translation)
-{
-//      Dprintk("Bus #%d is %s\n", m->mpc_busid, name);
-}
-
 static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, 
                 char *productid)
 {
diff --git a/include/asm-x86/mach-es7000/mach_mpparse.h b/include/asm-x86/mach-es7000/mach_mpparse.h
index 3afa1b01081..ef26d352362 100644
--- a/include/asm-x86/mach-es7000/mach_mpparse.h
+++ b/include/asm-x86/mach-es7000/mach_mpparse.h
@@ -3,12 +3,6 @@
 
 #include <linux/acpi.h>
 
-static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
-                                struct mpc_config_translation *translation)
-{
-        Dprintk("Bus #%d is %s\n", m->mpc_busid, name);
-}
-
 extern int parse_unisys_oem (char *oemptr);
 extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
 extern void setup_unisys(void);
diff --git a/include/asm-x86/mach-generic/mach_mpparse.h b/include/asm-x86/mach-generic/mach_mpparse.h
index 2a693715033..0d0b5ba2e9d 100644
--- a/include/asm-x86/mach-generic/mach_mpparse.h
+++ b/include/asm-x86/mach-generic/mach_mpparse.h
@@ -1,10 +1,6 @@
 #ifndef _MACH_MPPARSE_H
 #define _MACH_MPPARSE_H 1
 
-#include <asm/genapic.h>
-
-#define mpc_oem_bus_info (genapic->mpc_oem_bus_info)
-
 int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); 
 int acpi_madt_oem_check(char *oem_id, char *oem_table_id); 
 
diff --git a/include/asm-x86/mach-numaq/mach_mpparse.h b/include/asm-x86/mach-numaq/mach_mpparse.h
index 4a5d8a8b01a..459b1240118 100644
--- a/include/asm-x86/mach-numaq/mach_mpparse.h
+++ b/include/asm-x86/mach-numaq/mach_mpparse.h
@@ -1,20 +1,8 @@
 #ifndef __ASM_MACH_MPPARSE_H
 #define __ASM_MACH_MPPARSE_H
 
-extern int mp_bus_id_to_local[MAX_MP_BUSSES];
-extern int mp_bus_id_to_node[MAX_MP_BUSSES];
-
-static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, 
-                                struct mpc_config_translation *translation)
-{
-        int quad = translation->trans_quad;
-        int local = translation->trans_local;
-
-        mp_bus_id_to_node[m->mpc_busid] = quad;
-        mp_bus_id_to_local[m->mpc_busid] = local;
-        printk("Bus #%d is %s (node %d)\n", m->mpc_busid, name, quad);
-}
-
+extern void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
+                             struct mpc_config_translation *translation);
 extern void mpc_oem_pci_bus(struct mpc_config_bus *m,
         struct mpc_config_translation *translation);
 
diff --git a/include/asm-x86/mach-summit/mach_mpparse.h b/include/asm-x86/mach-summit/mach_mpparse.h
index e1af489a880..fdf59170133 100644
--- a/include/asm-x86/mach-summit/mach_mpparse.h
+++ b/include/asm-x86/mach-summit/mach_mpparse.h
@@ -12,12 +12,6 @@ extern void setup_summit(void);
 #define setup_summit()  {}
 #endif
 
-static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, 
-                                struct mpc_config_translation *translation)
-{
-        Dprintk("Bus #%d is %s\n", m->mpc_busid, name);
-}
-
 static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, 
                 char *productid)
 {