From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD356C433F5 for ; Mon, 28 Feb 2022 21:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230380AbiB1V3p (ORCPT ); Mon, 28 Feb 2022 16:29:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbiB1V3k (ORCPT ); Mon, 28 Feb 2022 16:29:40 -0500 Received: from mx-out.tlen.pl (mx-out.tlen.pl [193.222.135.175]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EC5C12F417 for ; Mon, 28 Feb 2022 13:28:59 -0800 (PST) Received: (wp-smtpd smtp.tlen.pl 1081 invoked from network); 28 Feb 2022 22:28:56 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1646083736; bh=g7R9U2bwvy9Lkf04ixIH6Wouxa60Zi+IJmWsYAWT3Oc=; h=From:To:Cc:Subject; b=R1drsAblz0IAgEgHGcCl12WZxGhsoysEwDMXBTG0A/Tv3C0QH9f4FMVVN0g7nQkBV xYUlkqJBw3GFAM8OWElbepBwPt2RCqJDHrvIk3CNpcUK4fbUJ9YidOcqmJMwA5jkDX C5iBJUVJCFBzIybqx6EtHinPHfJ1PfNMZHSwXdQ8= Received: from aafa139.neoplus.adsl.tpnet.pl (HELO localhost.localdomain) (mat.jonczyk@o2.pl@[83.4.130.139]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with SMTP for ; 28 Feb 2022 22:28:56 +0100 From: =?UTF-8?q?Mateusz=20Jo=C5=84czyk?= To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: =?UTF-8?q?Mateusz=20Jo=C5=84czyk?= , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH 04/10] x86/Kconfig: drop X86_32_NON_STANDARD Date: Mon, 28 Feb 2022 22:28:20 +0100 Message-Id: <20220228212826.27080-5-mat.jonczyk@o2.pl> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228212826.27080-1-mat.jonczyk@o2.pl> References: <20220228212826.27080-1-mat.jonczyk@o2.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-WP-MailID: 6fa34dc277ded7db64b1dfbd32d837cf X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [QaME] Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch drops the "Support non-standard 32-bit SMP architectures" configuration option. Currently, the only such an architecture is STA2X11, so this option is useless. STA2X11 could now be selected independently. The dependency of X86_BIGSMP on X86_32_NON_STANDARD was dropped in 2009, in commit 26f7ef14a76b ("x86: don't treat bigsmp as non-standard") but the help text for X86_32_NON_STANDARD was not updated since. CONFIG_X86_32_NON_STANDARD was used only in arch/x86/Kconfig, so it could be dropped easily. X86_32_NON_STANDARD depended on SMP, so (!SMP && !X86_32_NON_STANDARD) == !SMP and (SMP || X86_32_NON_STANDARD) == SMP Signed-off-by: Mateusz Jończyk Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" --- arch/x86/Kconfig | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 727fd3998022..61b58e24dc00 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -724,18 +724,6 @@ config X86_RDC321X as R-8610-(G). If you don't have one of these chips, you should say N here. -config X86_32_NON_STANDARD - bool "Support non-standard 32-bit SMP architectures" - depends on X86_32 && SMP - depends on X86_EXTENDED_PLATFORM - help - This option compiles in the bigsmp and STA2X11 default - subarchitectures. It is intended for a generic binary - kernel. If you select them all, kernel will probe it one by - one and will fallback to default. - -# Alphabetically sorted list of Non standard 32 bit platforms - config X86_SUPPORTS_MEMORY_FAILURE def_bool y # MCE code calls memory_failure(): @@ -747,7 +735,8 @@ config X86_SUPPORTS_MEMORY_FAILURE config STA2X11 bool "STA2X11 Companion Chip Support" - depends on X86_32_NON_STANDARD && PCI + depends on X86_32 && SMP + depends on X86_EXTENDED_PLATFORM && PCI select SWIOTLB select MFD_STA2X11 select GPIOLIB @@ -1074,7 +1063,7 @@ config UP_LATE_INIT config X86_UP_APIC bool "Local APIC support on uniprocessors" if !PCI_MSI default PCI_MSI - depends on X86_32 && !SMP && !X86_32_NON_STANDARD + depends on X86_32 && !SMP help A local APIC (Advanced Programmable Interrupt Controller) is an integrated interrupt controller in the CPU. If you have a single-CPU @@ -1099,7 +1088,7 @@ config X86_UP_IOAPIC config X86_LOCAL_APIC def_bool y - depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC || PCI_MSI + depends on X86_64 || SMP || X86_UP_APIC || PCI_MSI select IRQ_DOMAIN_HIERARCHY select PCI_MSI_IRQ_DOMAIN if PCI_MSI -- 2.25.1