Revert "x86/mpparse: Register APIC address only once"

This reverts commit bebb5af001dc6cb4f505bb21c4d5e2efbdc112e2 which is
commit f2208aa12c27bfada3c15c550c03ca81d42dcac2 upstream.

It is reported to cause problems in the stable branches, so revert it.

Link: https://lore.kernel.org/r/899b7c1419a064a2b721b78eade06659@stwm.de
Reported-by: Wolfgang Walter <linux@stwm.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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