x86: Move mpc_oem_pci_bus to x86_init_ops

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

diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index adb5d44d990904cbb14520cd4eb31d3f41e98618..fd2267baba1d30e9b5ba43737c66709678435e8e 100644 (file)
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -24,7 +24,6 @@ struct x86_quirks {
        int (*mach_find_smp_config)(unsigned int reserve);
 
        void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
-       void (*mpc_oem_pci_bus)(struct mpc_bus *m);
 };
 
 extern void x86_quirk_intr_init(void);

diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
index fc0eef2f5fdcbd147fd79087fff10267a688d97a..404e2d2b06d33c674c34a1a2de23baf18d2778cd 100644 (file)
--- a/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@ -1,6 +1,7 @@
 #ifndef _ASM_X86_PLATFORM_H
 #define _ASM_X86_PLATFORM_H
 
+struct mpc_bus;
 struct mpc_cpu;
 struct mpc_table;
 
@@ -10,12 +11,14 @@ struct mpc_table;
  * @setup_ioapic_ids:          platform specific ioapic id override
  * @mpc_apic_id:               platform specific mpc apic id assignment
  * @smp_read_mpc_oem:          platform specific oem mpc table setup
+ * @mpc_oem_pci_bus:           platform specific pci bus setup (default NULL)
  */
 struct x86_init_mpparse {
        void (*mpc_record)(unsigned int mode);
        void (*setup_ioapic_ids)(void);
        int (*mpc_apic_id)(struct mpc_cpu *m);
        void (*smp_read_mpc_oem)(struct mpc_table *mpc);
+       void (*mpc_oem_pci_bus)(struct mpc_bus *m);
 };
 
 /**

diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index 1bd3b0ed240030c306ac437615a0d8f1aef0d264..feebe8eed7dd5d455a6b52e2e1004b69aeb2cf3a 100644 (file)
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -271,7 +271,6 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
        .mach_get_smp_config            = NULL,
        .mach_find_smp_config           = NULL,
        .mpc_oem_bus_info               = mpc_oem_bus_info,
-       .mpc_oem_pci_bus                = mpc_oem_pci_bus,
 };
 
 static __init void early_check_numaq(void)
@@ -293,6 +292,7 @@ static __init void early_check_numaq(void)
                x86_init.mpparse.setup_ioapic_ids = x86_init_noop;
                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;
        }
 }
 

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 45abdf63edcdf8f6c8c3fc2f319047d02f53d4ef..72e1140723cfe5bae0ffc171f8cae3877460d5fe 100644 (file)
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -98,8 +98,8 @@ static void __init MP_bus_info(struct mpc_bus *m)
                mp_bus_id_to_type[m->busid] = MP_BUS_ISA;
 #endif
        } else if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI) - 1) == 0) {
-               if (x86_quirks->mpc_oem_pci_bus)
-                       x86_quirks->mpc_oem_pci_bus(m);
+               if (x86_init.mpparse.mpc_oem_pci_bus)
+                       x86_init.mpparse.mpc_oem_pci_bus(m);
 
                clear_bit(m->busid, mp_bus_not_pci);
 #if defined(CONFIG_EISA) || defined(CONFIG_MCA)