]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - queue-6.6/revert-x86-mpparse-register-apic-address-only-once.patch
Linux 6.1.85
[thirdparty/kernel/stable-queue.git] / queue-6.6 / revert-x86-mpparse-register-apic-address-only-once.patch
1 From 77a1e7b046bb70fc1214cd6965399ef5490dd9a6 Mon Sep 17 00:00:00 2001
2 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
3 Date: Mon, 8 Apr 2024 12:42:06 +0200
4 Subject: Revert "x86/mpparse: Register APIC address only once"
5
6 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
7
8 This reverts commit bebb5af001dc6cb4f505bb21c4d5e2efbdc112e2 which is
9 commit f2208aa12c27bfada3c15c550c03ca81d42dcac2 upstream.
10
11 It is reported to cause problems in the stable branches, so revert it.
12
13 Link: https://lore.kernel.org/r/899b7c1419a064a2b721b78eade06659@stwm.de
14 Reported-by: Wolfgang Walter <linux@stwm.de>
15 Cc: Thomas Gleixner <tglx@linutronix.de>
16 Cc: Borislav Petkov (AMD) <bp@alien8.de>
17 Cc: Guenter Roeck <linux@roeck-us.net>
18 Cc: Sasha Levin <sashal@kernel.org>
19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
20 ---
21 arch/x86/kernel/mpparse.c | 10 +++++-----
22 1 file changed, 5 insertions(+), 5 deletions(-)
23
24 --- a/arch/x86/kernel/mpparse.c
25 +++ b/arch/x86/kernel/mpparse.c
26 @@ -196,12 +196,12 @@ static int __init smp_read_mpc(struct mp
27 if (!smp_check_mpc(mpc, oem, str))
28 return 0;
29
30 - if (early) {
31 - /* Initialize the lapic mapping */
32 - if (!acpi_lapic)
33 - register_lapic_address(mpc->lapic);
34 + /* Initialize the lapic mapping */
35 + if (!acpi_lapic)
36 + register_lapic_address(mpc->lapic);
37 +
38 + if (early)
39 return 1;
40 - }
41
42 /* Now process the configuration blocks. */
43 while (count < mpc->length) {