x86, apic: Remove early_init_lapic_mapping()

[pandora-kernel.git] / arch / x86 / kernel / mpparse.c

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index db0b703..27ccb70 100644 (file)
--- 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);