From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1560A3A5424 for ; Fri, 22 May 2026 14:20:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459656; cv=none; b=Ne0FaZ8NVlAeRJ9f6YyK6ty2xGRtCy+35Mp4DzY0st92SV75sGE9lZ98G4wxmIm/KArcap8R1utMl8wUuXll1Qq9qCRwzR8FD1+SqgxoQ/E6FfuG33l+NW5yZm25abnjJwjCb+UnJCeaCRAhYUHvnW92bprBxuW1fhD1BYa5E2E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779459656; c=relaxed/simple; bh=mzT5RPd9Bi+ScLHLOYBVEYfphlaUbtu7jYGKrC+V9EU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pInAVTkz7Qxnbjklv0M47lq32B2lXmSvKarm6BLyodW5ppkE5nEYlGBXdxCSUQenf84wyiTckl6ZAqAvi+hCFcu5DxVq/Aw3N0DXI5/cGZm6JP1Rd+1fLyjRZs7OiBLkznIzRedRfSSCwlms1ohaSpm11tsGeCCTHkNpYV2zdX4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=D35guIUP; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="D35guIUP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15CCA1F000E9; Fri, 22 May 2026 14:20:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779459647; bh=H+T5Xm2pme6Jcpih7VPFA5EZ9bN5jCyycTaeJz2Unis=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=D35guIUPEhT4eG7ItlkowbWJs8WBZz7vxTKCtrhnchfpIR0mk9FMHqtmbWaaUouh5 MuWu3h6iHSR6nfI8VdU9fzpsi4WmmLS5trO+6K/zSXhpJFQs2rUnr9Daqnmujyr77y cndftdziCKUQv1fGV5ue0i3W6P5Pdymg/F0tJ1nZpWNxFQTGFF2am4YGYulMtPatlM d6YRlBCMnwCOqdhJFrBaxjEWO11daXzIPVCitqWClQBtPx6HkLbbvK9rD5ceI7j99D inU1LeqeqpBZgdUhAxX8GA7/u5DIGzUgKt8a9lqTcR+aBM7Cx/w+1FSpV2g8Ct4xEZ 0t4h66WZQN3ug== From: Arnd Bergmann To: Ingo Molnar Cc: Arnd Bergmann , Richard Weinberger , Anton Ivanov , Johannes Berg , Thomas Gleixner , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , Peter Zijlstra , Will Deacon , Boqun Feng , Gary Guo , Yury Norov , Rasmus Villemoes , Boris Ostrovsky , Alexander Usyskin , Tony Nguyen , Przemek Kitszel , x86@kernel.org, linux-kernel@vger.kernel.org, linux-um@lists.infradead.org Subject: [PATCH 5/8] x86: remove dependencies on CONFIG_M... CPU options Date: Fri, 22 May 2026 16:19:56 +0200 Message-Id: <20260522141959.1071595-6-arnd@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260522141959.1071595-1-arnd@kernel.org> References: <20260522141959.1071595-1-arnd@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnd Bergmann CPU specific features should generally be controlled by CPU_SUP_xxx options rather than CONFIG_Mxxx, to allow generic kernels to be built that work with all of them. Replace the few options that don't follow this scheme with checks on either CPU_SUP_xxx or X86_PAE by itself. Signed-off-by: Arnd Bergmann --- arch/x86/kernel/tsc.c | 2 +- arch/x86/xen/Kconfig | 3 +-- drivers/misc/mei/Kconfig | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index e7a43471783f..3d5d38035c52 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -1213,7 +1213,7 @@ static void __init tsc_disable_clocksource_watchdog(void) static void __init check_system_tsc_reliable(void) { -#if defined(CONFIG_MGEODEGX1) || defined(CONFIG_MGEODE_LX) || defined(CONFIG_X86_GENERIC) +#if defined(CONFIG_CPU_SUP_CYRIX_32) if (is_geode_lx()) { /* RTSC counts during suspend */ #define RTSC_SUSP 0x100 diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index aa4040fd9215..7e74db652215 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -10,8 +10,7 @@ config XEN select X86_HV_CALLBACK_VECTOR select HIBERNATE_CALLBACKS depends on X86_64 || (X86_32 && X86_PAE) - depends on X86_64 || (X86_GENERIC || MPENTIUM4 || MATOM) - depends on X86_LOCAL_APIC && X86_TSC + depends on X86_LOCAL_APIC help This is the Linux Xen port. Enabling this will allow the kernel to boot in a paravirtualized environment under the diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig index 2d1bc5b4d11b..faa451584002 100644 --- a/drivers/misc/mei/Kconfig +++ b/drivers/misc/mei/Kconfig @@ -4,7 +4,7 @@ config INTEL_MEI tristate "Intel Management Engine Interface" depends on PCI depends on X86 || DRM_XE!=n || COMPILE_TEST - default X86_64 || MATOM + default X86_64 || CPU_SUP_INTEL help The Intel Management Engine (Intel ME) provides Manageability, Security and Media services for system containing Intel chipsets. -- 2.39.5