x86/mpparse: Register APIC address only once

[sfrench/cifs-2.6.git] / arch / x86 / kernel / mpparse.c

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 1ccd30c8246faad1a2322081d030681ea8578288..e89171b0347a6b16658b366ad289a7fcaf08e859 100644 (file)
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -197,12 +197,12 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
        if (!smp_check_mpc(mpc, oem, str))
                return 0;
 
-       /* Initialize the lapic mapping */
-       if (!acpi_lapic)
-               register_lapic_address(mpc->lapic);
-
-       if (early)
+       if (early) {
+               /* Initialize the lapic mapping */
+               if (!acpi_lapic)
+                       register_lapic_address(mpc->lapic);
                return 1;
+       }
 
        /* Now process the configuration blocks. */
        while (count < mpc->length) {