x86: remove mpc_oem_bus_info()

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 16 insertions, 0 deletions

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 621eac569550..febd69dbbee9 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 a98ae0e57272..d9afbae5092b 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,