mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Mateusz Jończyk" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: mat.jonczyk@o2.pl, Ingo Molnar <mingo@kernel.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/Kconfig: Correct X86_X2APIC help text
Date: Tue, 25 Mar 2025 07:36:07 -0000	[thread overview]
Message-ID: <174288816711.14745.688065786285184139.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250322154541.40325-1-mat.jonczyk@o2.pl>

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@o2.pl>
AuthorDate:    Sat, 22 Mar 2025 16:45:41 +01:00
Committer:     Ingo Molnar <mingo@kernel.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@o2.pl>
Signed-off-by: Ingo Molnar <mingo@kernel.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"

  reply	other threads:[~2025-03-25  7:36 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-21 20:48 [PATCH v3 0/7] x86: Kconfig cleanups and help text improvements David Heidelberg via B4 Relay
2025-03-21 20:48 ` [PATCH v3 1/7] x86/Kconfig: Enable X86_X2APIC by default and improve help text David Heidelberg via B4 Relay
2025-03-22 15:45   ` [PATCH] x86/Kconfig: correct X86_X2APIC " Mateusz Jończyk
2025-03-25  7:36     ` tip-bot2 for Mateusz Jończyk [this message]
2025-03-25  7:36   ` [tip: x86/urgent] x86/Kconfig: Enable X86_X2APIC by default and improve " tip-bot2 for Mateusz Jończyk
2025-03-21 20:48 ` [PATCH v3 2/7] x86/Kconfig: Always enable ARCH_SPARSEMEM_ENABLE David Heidelberg via B4 Relay
2025-03-25  7:36   ` [tip: x86/urgent] " tip-bot2 for Mateusz Jończyk
2025-03-21 20:48 ` [PATCH v3 3/7] x86/Kconfig: Move all X86_EXTENDED_PLATFORM options together David Heidelberg via B4 Relay
2025-03-25  7:36   ` [tip: x86/urgent] " tip-bot2 for Mateusz Jończyk
2025-03-21 20:48 ` [PATCH v3 4/7] x86/Kconfig: Update lists in X86_EXTENDED_PLATFORM David Heidelberg via B4 Relay
2025-03-22 17:50   ` [PATCH] x86/Kconfig: fix lists in X86_EXTENDED_PLATFORM help text Mateusz Jończyk
2025-03-23  3:14     ` Andy Shevchenko
2025-03-25  7:22       ` Ingo Molnar
2025-03-25 14:14         ` Andy Shevchenko
2025-03-25  7:36     ` [tip: x86/urgent] x86/Kconfig: Fix " tip-bot2 for Mateusz Jończyk
2025-03-25  7:36   ` [tip: x86/urgent] x86/Kconfig: Update lists in X86_EXTENDED_PLATFORM tip-bot2 for Mateusz Jończyk
2025-03-21 20:48 ` [PATCH v3 5/7] x86/Kconfig: Document CONFIG_PCI_MMCONFIG David Heidelberg via B4 Relay
2025-03-22  7:11   ` Ingo Molnar
2025-03-25  7:36   ` [tip: x86/urgent] " tip-bot2 for Mateusz Jończyk
2025-03-21 20:48 ` [PATCH v3 6/7] x86/Kconfig: Make CONFIG_PCI_CNB20LE_QUIRK depend on X86_32 David Heidelberg via B4 Relay
2025-03-25  7:36   ` [tip: x86/urgent] " tip-bot2 for Mateusz Jończyk
2025-03-21 20:48 ` [PATCH v3 7/7] x86/Kconfig: Document release year of glibc 2.3.3 David Heidelberg via B4 Relay
2025-03-22  7:28   ` Ingo Molnar
2025-03-25  7:36   ` [tip: x86/urgent] " tip-bot2 for Mateusz Jończyk
2025-03-22 15:13 ` [PATCH v3 0/7] x86: Kconfig cleanups and help text improvements Mateusz Jończyk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=174288816711.14745.688065786285184139.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mat.jonczyk@o2.pl \
    --cc=mingo@kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®