aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/mpparse.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-12-07 00:55:29 -0800
committerThomas Gleixner <tglx@linutronix.de>2010-12-09 21:52:04 +0100
commitf1157141636848f52c5f74040bed0ba355cf59b7 (patch)
tree2e2cde97fe616fea129935d2d2e8742e3fe63f3b /arch/x86/kernel/mpparse.c
parentc0104d38a740b25662c592c71f6907676510289c (diff)
downloadkernel_samsung_tuna-f1157141636848f52c5f74040bed0ba355cf59b7.zip
kernel_samsung_tuna-f1157141636848f52c5f74040bed0ba355cf59b7.tar.gz
kernel_samsung_tuna-f1157141636848f52c5f74040bed0ba355cf59b7.tar.bz2
x86, apic: Remove early_init_lapic_mapping()
It is almost the same as smp_register_lapic_addr(). We just need to let smp_read_mpc() call smp_register_lapic_addr() when early==1. Add the apic_printk to smp_register_lapic_address() Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Suresh Siddha <suresh.b.siddha@intel.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> LKML-Reference: <4CFDF681.3030509@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r--arch/x86/kernel/mpparse.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index db0b703..27ccb70 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -289,17 +289,13 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
#ifdef CONFIG_X86_32
generic_mps_oem_check(mpc, oem, str);
#endif
- /* save the local APIC address, it might be non-default */
+ /* Initialize the lapic mapping */
if (!acpi_lapic)
- mp_lapic_addr = mpc->lapic;
+ register_lapic_address(mpc->lapic);
if (early)
return 1;
- /* Initialize the lapic mapping */
- if (!acpi_lapic)
- register_lapic_address(mpc->lapic);
-
if (mpc->oemptr)
x86_init.mpparse.smp_read_mpc_oem(mpc);