Skip to content

Commit 99bb1bd

Browse files
matjonIngo Molnar
authored andcommitted
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: 9232c49 ("x86/Kconfig: Enable X86_X2APIC by default and improve help text") Signed-off-by: Mateusz Jończyk <mat.jonczyk@o2.pl> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/20250322154541.40325-1-mat.jonczyk@o2.pl
1 parent 2487b6b commit 99bb1bd

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

arch/x86/Kconfig

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -471,14 +471,15 @@ config X86_X2APIC
471471
in 2019, but it can be disabled by the BIOS. It is also frequently
472472
emulated in virtual machines, even when the host CPU does not support
473473
it. Support in the CPU can be checked by executing
474-
cat /proc/cpuinfo | grep x2apic
474+
grep x2apic /proc/cpuinfo
475475

476-
If this configuration option is disabled, the kernel will not boot on
477-
some platforms that have x2APIC enabled.
476+
If this configuration option is disabled, the kernel will boot with
477+
very reduced functionality and performance on some platforms that
478+
have x2APIC enabled. On the other hand, on hardware that does not
479+
support x2APIC, a kernel with this option enabled will just fallback
480+
to older APIC implementations.
478481

479-
Say N if you know that your platform does not have x2APIC.
480-
481-
Otherwise, say Y.
482+
If in doubt, say Y.
482483

483484
config X86_POSTED_MSI
484485
bool "Enable MSI and MSI-x delivery by posted interrupts"

0 commit comments

Comments
 (0)