1 files changed, 24 insertions, 51 deletions

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index fcd513bf2846..5be95ef4ffec 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)";
@@ -70,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);
+}
 
-        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);
+static void __init MP_bus_info(struct mpc_bus *m)
+{
+        char str[7];
+
+        x86_init.mpparse.mpc_oem_bus_info(m, str);
 
 #if MAX_MP_BUSSES < 256
         if (m->busid >= MAX_MP_BUSSES) {
@@ -96,8 +100,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)
@@ -291,6 +295,8 @@ static void __init smp_dump_mptable(struct mpc_table *mpc, unsigned char *mpt)
                         1, mpc, mpc->length, 1);
 }
 
+void __init default_smp_read_mpc_oem(struct mpc_table *mpc) { }
+
 static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
 {
         char str[16];
@@ -312,16 +318,13 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
         if (early)
                 return 1;
 
-        if (mpc->oemptr && x86_quirks->smp_read_mpc_oem) {
-                struct mpc_oemtable *oem_table = (void *)(long)mpc->oemptr;
-                x86_quirks->smp_read_mpc_oem(oem_table, mpc->oemsize);
-        }
+        if (mpc->oemptr)
+                x86_init.mpparse.smp_read_mpc_oem(mpc);
 
         /*
          *      Now process the configuration blocks.
          */
-        if (x86_quirks->mpc_record)
-                *x86_quirks->mpc_record = 0;
+        x86_init.mpparse.mpc_record(0);
 
         while (count < mpc->length) {
                 switch (*mpt) {
@@ -353,8 +356,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
                         count = mpc->length;
                         break;
                 }
-                if (x86_quirks->mpc_record)
-                        (*x86_quirks->mpc_record)++;
+                x86_init.mpparse.mpc_record(1);
         }
 
 #ifdef CONFIG_X86_BIGSMP
@@ -608,7 +610,7 @@ static int __init check_physptr(struct mpf_intel *mpf, unsigned int early)
 /*
  * Scan the memory blocks for an SMP configuration block.
  */
-static void __init __get_smp_config(unsigned int early)
+void __init default_get_smp_config(unsigned int early)
 {
         struct mpf_intel *mpf = mpf_found;
 
@@ -625,11 +627,6 @@ static void __init __get_smp_config(unsigned int early)
         if (acpi_lapic && acpi_ioapic)
                 return;
 
-        if (x86_quirks->mach_get_smp_config) {
-                if (x86_quirks->mach_get_smp_config(early))
-                        return;
-        }
-
         printk(KERN_INFO "Intel MultiProcessor Specification v1.%d\n",
                mpf->specification);
 #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32)
@@ -670,16 +667,6 @@ static void __init __get_smp_config(unsigned int early)
          */
 }
 
-void __init early_get_smp_config(void)
-{
-        __get_smp_config(1);
-}
-
-void __init get_smp_config(void)
-{
-        __get_smp_config(0);
-}
-
 static void __init smp_reserve_bootmem(struct mpf_intel *mpf)
 {
         unsigned long size = get_mpc_size(mpf->physptr);
@@ -745,14 +732,10 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
         return 0;
 }
 
-static void __init __find_smp_config(unsigned int reserve)
+void __init default_find_smp_config(unsigned int reserve)
 {
         unsigned int address;
 
-        if (x86_quirks->mach_find_smp_config) {
-                if (x86_quirks->mach_find_smp_config(reserve))
-                        return;
-        }
         /*
          * FIXME: Linux assumes you have 640K of base ram..
          * this continues the error...
@@ -787,16 +770,6 @@ static void __init __find_smp_config(unsigned int reserve)
                 smp_scan_config(address, 0x400, reserve);
 }
 
-void __init early_find_smp_config(void)
-{
-        __find_smp_config(0);
-}
-
-void __init find_smp_config(void)
-{
-        __find_smp_config(1);
-}
-
 #ifdef CONFIG_X86_IO_APIC
 static u8 __initdata irq_used[MAX_IRQ_SOURCES];