diff options
-rw-r--r-- | arch/x86/include/asm/mpspec_def.h | 2 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/include/asm/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h index e5a8468c215b..fabf970813bf 100644 --- a/arch/x86/include/asm/mpspec_def.h +++ b/arch/x86/include/asm/mpspec_def.h | |||
@@ -139,7 +139,7 @@ enum mp_irq_source_types { | |||
139 | 139 | ||
140 | #define MP_APIC_ALL 0xFF | 140 | #define MP_APIC_ALL 0xFF |
141 | 141 | ||
142 | struct mpc_config_lintsrc { | 142 | struct mpc_lintsrc { |
143 | unsigned char mpc_type; | 143 | unsigned char mpc_type; |
144 | unsigned char mpc_irqtype; | 144 | unsigned char mpc_irqtype; |
145 | unsigned short mpc_irqflag; | 145 | unsigned short mpc_irqflag; |
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 6b75d3143586..defe87e12056 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -233,7 +233,7 @@ static void __init MP_intsrc_info(struct mpc_intsrc *m) | |||
233 | 233 | ||
234 | #endif | 234 | #endif |
235 | 235 | ||
236 | static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m) | 236 | static void __init MP_lintsrc_info(struct mpc_lintsrc *m) |
237 | { | 237 | { |
238 | apic_printk(APIC_VERBOSE, "Lint: type %d, pol %d, trig %d, bus %02x," | 238 | apic_printk(APIC_VERBOSE, "Lint: type %d, pol %d, trig %d, bus %02x," |
239 | " IRQ %02x, APIC ID %x, APIC LINT %02x\n", | 239 | " IRQ %02x, APIC ID %x, APIC LINT %02x\n", |
@@ -368,8 +368,8 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) | |||
368 | } | 368 | } |
369 | case MP_LINTSRC: | 369 | case MP_LINTSRC: |
370 | { | 370 | { |
371 | struct mpc_config_lintsrc *m = | 371 | struct mpc_lintsrc *m = |
372 | (struct mpc_config_lintsrc *)mpt; | 372 | (struct mpc_lintsrc *)mpt; |
373 | MP_lintsrc_info(m); | 373 | MP_lintsrc_info(m); |
374 | mpt += sizeof(*m); | 374 | mpt += sizeof(*m); |
375 | count += sizeof(*m); | 375 | count += sizeof(*m); |
@@ -532,7 +532,7 @@ static inline void __init construct_ioapic_table(int mpc_default_type) { } | |||
532 | static inline void __init construct_default_ISA_mptable(int mpc_default_type) | 532 | static inline void __init construct_default_ISA_mptable(int mpc_default_type) |
533 | { | 533 | { |
534 | struct mpc_cpu processor; | 534 | struct mpc_cpu processor; |
535 | struct mpc_config_lintsrc lintsrc; | 535 | struct mpc_lintsrc lintsrc; |
536 | int linttypes[2] = { mp_ExtINT, mp_NMI }; | 536 | int linttypes[2] = { mp_ExtINT, mp_NMI }; |
537 | int i; | 537 | int i; |
538 | 538 | ||
@@ -903,8 +903,8 @@ static int __init replace_intsrc_all(struct mpc_table *mpc, | |||
903 | } | 903 | } |
904 | case MP_LINTSRC: | 904 | case MP_LINTSRC: |
905 | { | 905 | { |
906 | struct mpc_config_lintsrc *m = | 906 | struct mpc_lintsrc *m = |
907 | (struct mpc_config_lintsrc *)mpt; | 907 | (struct mpc_lintsrc *)mpt; |
908 | mpt += sizeof(*m); | 908 | mpt += sizeof(*m); |
909 | count += sizeof(*m); | 909 | count += sizeof(*m); |
910 | break; | 910 | break; |