Received-SPF: pass (google.com: domain of linux-kernel+bounces-152535-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Sun, 21 Apr 2024 17:11:04 -0000
From: "tip-bot2 for Masahiro Yamada" <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To: linux-tip-commits@vger.kernel.org
Subject: [tip: x86/build] x86/Kconfig: Merge the two
 CONFIG_X86_EXTENDED_PLATFORM entries
Cc: Masahiro Yamada <masahiroy@kernel.org>,
 "Borislav Petkov (AMD)" <bp@alien8.de>, x86@kernel.org,
 linux-kernel@vger.kernel.org
In-Reply-To: <20240204100719.42574-1-masahiroy@kernel.org>
References: <20240204100719.42574-1-masahiroy@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Message-ID: <171371946443.10875.15940850527405121296.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe:
 Contact <mailto:tglx@linutronix.de> to get blacklisted from these emails
Precedence: bulk
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

The following commit has been merged into the x86/build branch of tip:

Commit-ID:     71d99ea47fbd3179e01f8037aad1d1367a821de2
Gitweb:        https://git.kernel.org/tip/71d99ea47fbd3179e01f8037aad1d1367a821de2
Author:        Masahiro Yamada <masahiroy@kernel.org>
AuthorDate:    Sun, 04 Feb 2024 19:07:19 +09:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Sun, 21 Apr 2024 18:41:40 +02:00

x86/Kconfig: Merge the two CONFIG_X86_EXTENDED_PLATFORM entries

There are two menu entries for X86_EXTENDED_PLATFORM, one for X86_32 and
the other for X86_64.

These entries are nearly identical, with the only difference being the
platform list in the help message.

While this structure was intended by commit

  8425091ff8af ("x86: improve the help text of X86_EXTENDED_PLATFORM"),

there is no need to duplicate the entire config entry. Instead, provide
a little more clarification in the help message.

  [ bp: Massage. ]

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20240204100719.42574-1-masahiroy@kernel.org
---
 arch/x86/Kconfig | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e88f6f7..0046ffb 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -506,10 +506,9 @@ config X86_FRED
 	  ring transitions and exception/interrupt handling if the
 	  system supports.
 
-if X86_32
 config X86_BIGSMP
 	bool "Support for big SMP systems with more than 8 CPUs"
-	depends on SMP
+	depends on SMP && X86_32
 	help
 	  This option is needed for the systems that have more than 8 CPUs.
 
@@ -522,7 +521,10 @@ config X86_EXTENDED_PLATFORM
 	  systems out there.)
 
 	  If you enable this option then you'll be able to select support
-	  for the following (non-PC) 32 bit x86 platforms:
+	  for the following non-PC x86 platforms, depending on the value of
+	  CONFIG_64BIT.
+
+	  32-bit platforms (CONFIG_64BIT=n):
 		Goldfish (Android emulator)
 		AMD Elan
 		RDC R-321x SoC
@@ -530,28 +532,14 @@ config X86_EXTENDED_PLATFORM
 		STA2X11-based (e.g. Northville)
 		Moorestown MID devices
 
-	  If you have one of these systems, or if you want to build a
-	  generic distribution kernel, say Y here - otherwise say N.
-endif # X86_32
-
-if X86_64
-config X86_EXTENDED_PLATFORM
-	bool "Support for extended (non-PC) x86 platforms"
-	default y
-	help
-	  If you disable this option then the kernel will only support
-	  standard PC platforms. (which covers the vast majority of
-	  systems out there.)
-
-	  If you enable this option then you'll be able to select support
-	  for the following (non-PC) 64 bit x86 platforms:
+	  64-bit platforms (CONFIG_64BIT=y):
 		Numascale NumaChip
 		ScaleMP vSMP
 		SGI Ultraviolet
 
 	  If you have one of these systems, or if you want to build a
 	  generic distribution kernel, say Y here - otherwise say N.
-endif # X86_64
+
 # This is an alphabetically sorted list of 64 bit extended platforms
 # Please maintain the alphabetic order if and when there are additions
 config X86_NUMACHIP