3 files changed, 10 insertions, 7 deletions

diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index feebe8eed7dd..700273dca684 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -270,7 +270,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
         .arch_trap_init                 = NULL,
         .mach_get_smp_config            = NULL,
         .mach_find_smp_config           = NULL,
-        .mpc_oem_bus_info               = mpc_oem_bus_info,
 };
 
 static __init void early_check_numaq(void)
@@ -293,6 +292,7 @@ static __init void early_check_numaq(void)
                 x86_init.mpparse.mpc_apic_id = mpc_apic_id;
                 x86_init.mpparse.smp_read_mpc_oem = smp_read_mpc_oem;
                 x86_init.mpparse.mpc_oem_pci_bus = mpc_oem_pci_bus;
+                x86_init.mpparse.mpc_oem_bus_info = mpc_oem_bus_info;
         }
 }
 
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 72e1140723cf..a42f23f1dc7e 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -72,16 +72,18 @@ static void __init MP_processor_info(struct mpc_cpu *m)
 }
 
 #ifdef CONFIG_X86_IO_APIC
-static void __init MP_bus_info(struct mpc_bus *m)
+void __init default_mpc_oem_bus_info(struct mpc_bus *m, char *str)
 {
-        char str[7];
         memcpy(str, m->bustype, 6);
         str[6] = 0;
+        apic_printk(APIC_VERBOSE, "Bus #%d is %s\n", m->busid, str);
+}
+
+static void __init MP_bus_info(struct mpc_bus *m)
+{
+        char str[7];
 
-        if (x86_quirks->mpc_oem_bus_info)
-                x86_quirks->mpc_oem_bus_info(m, str);
-        else
-                apic_printk(APIC_VERBOSE, "Bus #%d is %s\n", m->busid, str);
+        x86_init.mpparse.mpc_oem_bus_info(m, str);
 
 #if MAX_MP_BUSSES < 256
         if (m->busid >= MAX_MP_BUSSES) {
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index fb5d93c077d8..27685edc5460 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -31,5 +31,6 @@ struct __initdata x86_init_ops x86_init = {
                 .setup_ioapic_ids       = x86_init_noop,
                 .mpc_apic_id            = default_mpc_apic_id,
                 .smp_read_mpc_oem       = default_smp_read_mpc_oem,
+                .mpc_oem_bus_info       = default_mpc_oem_bus_info,
         },
 };