From: Ingo Molnar Date: Fri, 25 Apr 2025 08:42:08 +0000 (+0200) Subject: x86/cpu: Make CONFIG_X86_TSC unconditional X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=111cbb4596e336373ab93e202918f4cdbf78a4c3;p=thirdparty%2Fkernel%2Flinux.git x86/cpu: Make CONFIG_X86_TSC unconditional I.e. it's a boot time requirement for the CPU to support it. This only removes the Kconfig glue, removal of all now dead !X86_TSC code will happen in a separate patch. Signed-off-by: Ingo Molnar Reviewed-by: Arnd Bergmann Acked-by: Dave Hansen Cc: Linus Torvalds Link: https://lore.kernel.org/r/20250425084216.3913608-12-mingo@kernel.org --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 34e92da22053c..f4b8722ba1064 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -683,7 +683,6 @@ config X86_INTEL_QUARK depends on X86_32 depends on X86_EXTENDED_PLATFORM depends on X86_PLATFORM_DEVICES - depends on X86_TSC depends on PCI depends on PCI_GOANY depends on X86_IO_APIC diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 1377edd9a9974..678fdc10daef2 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -262,7 +262,6 @@ config X86_USE_PPRO_CHECKSUM config X86_TSC def_bool y - depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MATOM) || X86_64 config X86_HAVE_PAE def_bool y diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index aa4040fd92156..dc38f950b1e25 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -11,7 +11,7 @@ config XEN 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