[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <174288816711.14745.688065786285184139.tip-bot2@tip-bot2>
Date: Tue, 25 Mar 2025 07:36:07 -0000
From:
tip-bot2 for Mateusz Jończyk <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: mat.jonczyk@...pl, Ingo Molnar <mingo@...nel.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: x86/urgent] x86/Kconfig: Correct X86_X2APIC help text
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 99bb1bd810eaf37e15ef757a30a815e774a2445b
Gitweb: https://git.kernel.org/tip/99bb1bd810eaf37e15ef757a30a815e774a2445b
Author: Mateusz Jończyk <mat.jonczyk@...pl>
AuthorDate: Sat, 22 Mar 2025 16:45:41 +01:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Tue, 25 Mar 2025 08:17:49 +01:00
x86/Kconfig: Correct X86_X2APIC help text
Currently, it is not true that the kernel will panic with CONFIG_X86_X2APIC=n
on systems that require it; it will try to disable the APIC and run without
it to at least give the user a clear warning message. See the second
variant of check_x2apic() in arch/x86/kernel/apic/apic.c .
Also massage some other parts of the help text.
Fixes: 9232c49ff31c ("x86/Kconfig: Enable X86_X2APIC by default and improve help text")
Signed-off-by: Mateusz Jończyk <mat.jonczyk@...pl>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Link: https://lore.kernel.org/r/20250322154541.40325-1-mat.jonczyk@o2.pl
---
arch/x86/Kconfig | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e72cb77..ef48584 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -471,14 +471,15 @@ config X86_X2APIC
in 2019, but it can be disabled by the BIOS. It is also frequently
emulated in virtual machines, even when the host CPU does not support
it. Support in the CPU can be checked by executing
- cat /proc/cpuinfo | grep x2apic
+ grep x2apic /proc/cpuinfo
- If this configuration option is disabled, the kernel will not boot on
- some platforms that have x2APIC enabled.
+ If this configuration option is disabled, the kernel will boot with
+ very reduced functionality and performance on some platforms that
+ have x2APIC enabled. On the other hand, on hardware that does not
+ support x2APIC, a kernel with this option enabled will just fallback
+ to older APIC implementations.
- Say N if you know that your platform does not have x2APIC.
-
- Otherwise, say Y.
+ If in doubt, say Y.
config X86_POSTED_MSI
bool "Enable MSI and MSI-x delivery by posted interrupts"
Powered by blists - more mailing lists