diff options
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r-- | arch/x86/kernel/mpparse.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index c5c5b8df1dbc..154de681e8b2 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -246,8 +246,7 @@ static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m) | |||
246 | * Read/parse the MPC | 246 | * Read/parse the MPC |
247 | */ | 247 | */ |
248 | 248 | ||
249 | static int __init smp_check_mpc(struct mp_config_table *mpc, char *oem, | 249 | static int __init smp_check_mpc(struct mpc_table *mpc, char *oem, char *str) |
250 | char *str) | ||
251 | { | 250 | { |
252 | 251 | ||
253 | if (memcmp(mpc->mpc_signature, MPC_SIGNATURE, 4)) { | 252 | 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, | |||
283 | return 1; | 282 | return 1; |
284 | } | 283 | } |
285 | 284 | ||
286 | static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early) | 285 | static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) |
287 | { | 286 | { |
288 | char str[16]; | 287 | char str[16]; |
289 | char oem[10]; | 288 | char oem[10]; |
@@ -843,7 +842,7 @@ static int __init get_MP_intsrc_index(struct mpc_config_intsrc *m) | |||
843 | static struct mpc_config_intsrc __initdata *m_spare[SPARE_SLOT_NUM]; | 842 | static struct mpc_config_intsrc __initdata *m_spare[SPARE_SLOT_NUM]; |
844 | #endif | 843 | #endif |
845 | 844 | ||
846 | static int __init replace_intsrc_all(struct mp_config_table *mpc, | 845 | static int __init replace_intsrc_all(struct mpc_table *mpc, |
847 | unsigned long mpc_new_phys, | 846 | unsigned long mpc_new_phys, |
848 | unsigned long mpc_new_length) | 847 | unsigned long mpc_new_length) |
849 | { | 848 | { |
@@ -1014,8 +1013,7 @@ static int __init update_mp_table(void) | |||
1014 | char str[16]; | 1013 | char str[16]; |
1015 | char oem[10]; | 1014 | char oem[10]; |
1016 | struct intel_mp_floating *mpf; | 1015 | struct intel_mp_floating *mpf; |
1017 | struct mp_config_table *mpc; | 1016 | struct mpc_table *mpc, *mpc_new; |
1018 | struct mp_config_table *mpc_new; | ||
1019 | 1017 | ||
1020 | if (!enable_update_mptable) | 1018 | if (!enable_update_mptable) |
1021 | return 0; | 1019 | return 0; |