x86: Move ioapic_ids_setup to x86_init_ops

[deliverable/linux.git] / arch / x86 / kernel / apic / numaq_32.c

diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index b5f0b1dc7dd0d4ac38a5792c13c22aa391eeed68..f3717659265d357b2671fb25cf05070d982ddc40 100644 (file)
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -262,12 +262,6 @@ static void __init
        }
 }
 
-static int __init numaq_setup_ioapic_ids(void)
-{
-       /* so can skip it */
-       return 1;
-}
-
 static struct x86_quirks numaq_x86_quirks __initdata = {
        .arch_pre_time_init             = numaq_pre_time_init,
        .arch_time_init                 = NULL,
@@ -280,7 +274,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
        .mpc_oem_bus_info               = mpc_oem_bus_info,
        .mpc_oem_pci_bus                = mpc_oem_pci_bus,
        .smp_read_mpc_oem               = smp_read_mpc_oem,
-       .setup_ioapic_ids               = numaq_setup_ioapic_ids,
 };
 
 static __init void early_check_numaq(void)
@@ -299,6 +292,7 @@ static __init void early_check_numaq(void)
        if (found_numaq) {
                x86_quirks = &numaq_x86_quirks;
                x86_init.mpparse.mpc_record = numaq_mpc_record;
+               x86_init.mpparse.setup_ioapic_ids = x86_init_noop;
        }
 }