x86: rename mpc_config_processor to mpc_cpu

[safe/jmp/linux-2.6] / arch / x86 / kernel / mpparse.c

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index c5c5b8d..1ec13bb 100644 (file)
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -49,7 +49,7 @@ static int __init mpf_checksum(unsigned char *mp, int len)
        return sum & 0xFF;
 }
 
-static void __init MP_processor_info(struct mpc_config_processor *m)
+static void __init MP_processor_info(struct mpc_cpu *m)
 {
        int apicid;
        char *bootup_cpu = "";
@@ -74,7 +74,7 @@ static void __init MP_processor_info(struct mpc_config_processor *m)
 }
 
 #ifdef CONFIG_X86_IO_APIC
-static void __init MP_bus_info(struct mpc_config_bus *m)
+static void __init MP_bus_info(struct mpc_bus *m)
 {
        char str[7];
        memcpy(str, m->mpc_bustype, 6);
@@ -246,8 +246,7 @@ static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m)
  * Read/parse the MPC
  */
 
-static int __init smp_check_mpc(struct mp_config_table *mpc, char *oem,
-                               char *str)
+static int __init smp_check_mpc(struct mpc_table *mpc, char *oem, char *str)
 {
 
        if (memcmp(mpc->mpc_signature, MPC_SIGNATURE, 4)) {
@@ -283,7 +282,7 @@ static int __init smp_check_mpc(struct mp_config_table *mpc, char *oem,
        return 1;
 }
 
-static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
+static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
 {
        char str[16];
        char oem[10];
@@ -328,8 +327,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
                switch (*mpt) {
                case MP_PROCESSOR:
                        {
-                               struct mpc_config_processor *m =
-                                   (struct mpc_config_processor *)mpt;
+                               struct mpc_cpu *m = (struct mpc_cpu *)mpt;
                                /* ACPI may have already provided this data */
                                if (!acpi_lapic)
                                        MP_processor_info(m);
@@ -339,8 +337,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
                        }
                case MP_BUS:
                        {
-                               struct mpc_config_bus *m =
-                                   (struct mpc_config_bus *)mpt;
+                               struct mpc_bus *m = (struct mpc_bus *)mpt;
 #ifdef CONFIG_X86_IO_APIC
                                MP_bus_info(m);
 #endif
@@ -489,7 +486,7 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)
 static void __init construct_ioapic_table(int mpc_default_type)
 {
        struct mpc_config_ioapic ioapic;
-       struct mpc_config_bus bus;
+       struct mpc_bus bus;
 
        bus.mpc_type = MP_BUS;
        bus.mpc_busid = 0;
@@ -536,7 +533,7 @@ static inline void __init construct_ioapic_table(int mpc_default_type) { }
 
 static inline void __init construct_default_ISA_mptable(int mpc_default_type)
 {
-       struct mpc_config_processor processor;
+       struct mpc_cpu processor;
        struct mpc_config_lintsrc lintsrc;
        int linttypes[2] = { mp_ExtINT, mp_NMI };
        int i;
@@ -657,7 +654,7 @@ static void __init __get_smp_config(unsigned int early)
                 * ISA defaults and hope it will work.
                 */
                if (!mp_irq_entries) {
-                       struct mpc_config_bus bus;
+                       struct mpc_bus bus;
 
                        printk(KERN_ERR "BIOS bug, no explicit IRQ entries, "
                               "using default mptable. "
@@ -843,7 +840,7 @@ static int  __init get_MP_intsrc_index(struct mpc_config_intsrc *m)
 static struct mpc_config_intsrc __initdata *m_spare[SPARE_SLOT_NUM];
 #endif
 
-static int  __init replace_intsrc_all(struct mp_config_table *mpc,
+static int  __init replace_intsrc_all(struct mpc_table *mpc,
                                        unsigned long mpc_new_phys,
                                        unsigned long mpc_new_length)
 {
@@ -860,16 +857,14 @@ static int  __init replace_intsrc_all(struct mp_config_table *mpc,
                switch (*mpt) {
                case MP_PROCESSOR:
                        {
-                               struct mpc_config_processor *m =
-                                   (struct mpc_config_processor *)mpt;
+                               struct mpc_cpu *m = (struct mpc_cpu *)mpt;
                                mpt += sizeof(*m);
                                count += sizeof(*m);
                                break;
                        }
                case MP_BUS:
                        {
-                               struct mpc_config_bus *m =
-                                   (struct mpc_config_bus *)mpt;
+                               struct mpc_bus *m = (struct mpc_bus *)mpt;
                                mpt += sizeof(*m);
                                count += sizeof(*m);
                                break;
@@ -1014,8 +1009,7 @@ static int __init update_mp_table(void)
        char str[16];
        char oem[10];
        struct intel_mp_floating *mpf;
-       struct mp_config_table *mpc;
-       struct mp_config_table *mpc_new;
+       struct mpc_table *mpc, *mpc_new;
 
        if (!enable_update_mptable)
                return 0;