diff options
-rw-r--r-- | arch/x86/include/asm/mpspec_def.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse.c | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/arch/x86/include/asm/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h index 7e8ca5136b29..79289c70afd6 100644 --- a/arch/x86/include/asm/mpspec_def.h +++ b/arch/x86/include/asm/mpspec_def.h | |||
@@ -108,7 +108,7 @@ struct mpc_bus { | |||
108 | 108 | ||
109 | #define MPC_APIC_USABLE 0x01 | 109 | #define MPC_APIC_USABLE 0x01 |
110 | 110 | ||
111 | struct mpc_config_ioapic { | 111 | struct mpc_ioapic { |
112 | unsigned char mpc_type; | 112 | unsigned char mpc_type; |
113 | unsigned char mpc_apicid; | 113 | unsigned char mpc_apicid; |
114 | unsigned char mpc_apicver; | 114 | unsigned char mpc_apicver; |
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 1ec13bb18730..7ec4b0da9851 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -133,7 +133,7 @@ static int bad_ioapic(unsigned long address) | |||
133 | return 0; | 133 | return 0; |
134 | } | 134 | } |
135 | 135 | ||
136 | static void __init MP_ioapic_info(struct mpc_config_ioapic *m) | 136 | static void __init MP_ioapic_info(struct mpc_ioapic *m) |
137 | { | 137 | { |
138 | if (!(m->mpc_flags & MPC_APIC_USABLE)) | 138 | if (!(m->mpc_flags & MPC_APIC_USABLE)) |
139 | return; | 139 | return; |
@@ -348,12 +348,11 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) | |||
348 | case MP_IOAPIC: | 348 | case MP_IOAPIC: |
349 | { | 349 | { |
350 | #ifdef CONFIG_X86_IO_APIC | 350 | #ifdef CONFIG_X86_IO_APIC |
351 | struct mpc_config_ioapic *m = | 351 | struct mpc_ioapic *m = (struct mpc_ioapic *)mpt; |
352 | (struct mpc_config_ioapic *)mpt; | ||
353 | MP_ioapic_info(m); | 352 | MP_ioapic_info(m); |
354 | #endif | 353 | #endif |
355 | mpt += sizeof(struct mpc_config_ioapic); | 354 | mpt += sizeof(struct mpc_ioapic); |
356 | count += sizeof(struct mpc_config_ioapic); | 355 | count += sizeof(struct mpc_ioapic); |
357 | break; | 356 | break; |
358 | } | 357 | } |
359 | case MP_INTSRC: | 358 | case MP_INTSRC: |
@@ -485,7 +484,7 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type) | |||
485 | 484 | ||
486 | static void __init construct_ioapic_table(int mpc_default_type) | 485 | static void __init construct_ioapic_table(int mpc_default_type) |
487 | { | 486 | { |
488 | struct mpc_config_ioapic ioapic; | 487 | struct mpc_ioapic ioapic; |
489 | struct mpc_bus bus; | 488 | struct mpc_bus bus; |
490 | 489 | ||
491 | bus.mpc_type = MP_BUS; | 490 | bus.mpc_type = MP_BUS; |
@@ -871,8 +870,8 @@ static int __init replace_intsrc_all(struct mpc_table *mpc, | |||
871 | } | 870 | } |
872 | case MP_IOAPIC: | 871 | case MP_IOAPIC: |
873 | { | 872 | { |
874 | mpt += sizeof(struct mpc_config_ioapic); | 873 | mpt += sizeof(struct mpc_ioapic); |
875 | count += sizeof(struct mpc_config_ioapic); | 874 | count += sizeof(struct mpc_ioapic); |
876 | break; | 875 | break; |
877 | } | 876 | } |
878 | case MP_INTSRC: | 877 | case MP_INTSRC: |