x86: Move mpc_apic_id to x86_init_ops

The mpc_apic_id setup is handled by a x86_quirk. Make it a
x86_init_ops function with a default implementation.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

3 files changed, 9 insertions, 5 deletions

diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index f3717659265d..222413f7e797 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_apic_id                    = mpc_apic_id,
         .mpc_oem_bus_info               = mpc_oem_bus_info,
         .mpc_oem_pci_bus                = mpc_oem_pci_bus,
         .smp_read_mpc_oem               = smp_read_mpc_oem,
@@ -293,6 +292,7 @@ static __init void early_check_numaq(void)
                 x86_quirks = &numaq_x86_quirks;
                 x86_init.mpparse.mpc_record = numaq_mpc_record;
                 x86_init.mpparse.setup_ioapic_ids = x86_init_noop;
+                x86_init.mpparse.mpc_apic_id = mpc_apic_id;
         }
 }
 
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index b2179fdf0ff7..04560860a72a 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -45,6 +45,11 @@ static int __init mpf_checksum(unsigned char *mp, int len)
         return sum & 0xFF;
 }
 
+int __init default_mpc_apic_id(struct mpc_cpu *m)
+{
+        return m->apicid;
+}
+
 static void __init MP_processor_info(struct mpc_cpu *m)
 {
         int apicid;
@@ -55,10 +60,7 @@ static void __init MP_processor_info(struct mpc_cpu *m)
                 return;
         }
 
-        if (x86_quirks->mpc_apic_id)
-                apicid = x86_quirks->mpc_apic_id(m);
-        else
-                apicid = m->apicid;
+        apicid = x86_init.mpparse.mpc_apic_id(m);
 
         if (m->cpuflag & CPU_BOOTPROCESSOR) {
                 bootup_cpu = " (Bootup-CPU)";
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index f4a32b3ab024..08749f2612f3 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -6,6 +6,7 @@
 #include <linux/init.h>
 
 #include <asm/bios_ebda.h>
+#include <asm/mpspec.h>
 #include <asm/setup.h>
 #include <asm/e820.h>
 
@@ -28,5 +29,6 @@ struct __initdata x86_init_ops x86_init = {
         .mpparse = {
                 .mpc_record             = x86_init_uint_noop,
                 .setup_ioapic_ids       = x86_init_noop,
+                .mpc_apic_id            = default_mpc_apic_id,
         },
 };