--- /dev/null
+From 77a1e7b046bb70fc1214cd6965399ef5490dd9a6 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Mon, 8 Apr 2024 12:42:06 +0200
+Subject: Revert "x86/mpparse: Register APIC address only once"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 3428faa0d675f6a6284331731b762dc041011b3c 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>
+---
+ arch/x86/kernel/mpparse.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/arch/x86/kernel/mpparse.c
++++ b/arch/x86/kernel/mpparse.c
+@@ -196,12 +196,12 @@ static int __init smp_read_mpc(struct mp
+ 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) {