6.6-stable patches

added patches:
	revert-x86-mpparse-register-apic-address-only-once.patch

diff --git a/queue-6.6/revert-x86-mpparse-register-apic-address-only-once.patch b/queue-6.6/revert-x86-mpparse-register-apic-address-only-once.patch
new file mode 100644 (file)
index 0000000..b89372a
--- /dev/null
+++ b/queue-6.6/revert-x86-mpparse-register-apic-address-only-once.patch
@@ -0,0 +1,43 @@
+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 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>
+---
+ 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) {

diff --git a/queue-6.6/series b/queue-6.6/series
index a65896a8ed4100dd6670f42254305fa53c1a2684..39cf3a81b6c2069115cc12219dd5f7fe10f68770 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -238,4 +238,5 @@ smb-client-fix-potential-uaf-in-cifs_signal_cifsd_for_reconnect.patch
 drm-i915-gt-disable-hw-load-balancing-for-ccs.patch
 drm-i915-gt-do-not-generate-the-command-streamer-for-all-the-ccs.patch
 drm-i915-gt-enable-only-one-ccs-for-compute-workload.patch
+revert-x86-mpparse-register-apic-address-only-once.patch
 of-module-prevent-null-pointer-dereference-in-vsnprintf.patch