diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-04-25 11:42:01 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-05-06 09:02:10 +0300 |
| commit | dbafa16ec2b6be40055db181c99f2529b20dd951 (patch) | |
| tree | d15bbea98430298ff991fca3e1a82e955fa540df | |
| parent | 7d328c5de43a9e29dc6cd1ba3e578c1a32ebc486 (diff) | |
| download | linux-dbafa16ec2b6be40055db181c99f2529b20dd951.tar.xz | |
x86/cpu: Remove TSC-less CONFIG_M586 support
Remove support for TSC-less Pentium variants.
All TSC-capable Pentium variants, derivatives and
clones should still work under the M586TSC or M586MMX
options.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250425084216.3913608-5-mingo@kernel.org
| -rw-r--r-- | arch/x86/Kconfig.cpu | 10 | ||||
| -rw-r--r-- | arch/x86/Makefile_32.cpu | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/vermagic.h | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 71f264443d78..9b912091dabd 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -43,14 +43,6 @@ choice See each option's help text for additional details. If you don't know what to do, choose "Pentium-Pro". -config M586 - bool "586/K5/5x86/6x86/6x86MX" - depends on X86_32 - help - Select this for an 586 or 686 series processor such as the AMD K5, - the Cyrix 5x86, 6x86 and 6x86MX. This choice does not - assume the RDTSC (Read Time Stamp Counter) instruction. - config M586TSC bool "Pentium-Classic" depends on X86_32 @@ -250,7 +242,7 @@ config X86_L1_CACHE_SHIFT default "7" if MPENTIUM4 default "6" if MK7 || MPENTIUMM || MATOM || MVIAC7 || X86_GENERIC || X86_64 default "4" if MGEODEGX1 - default "5" if MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX + default "5" if MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MVIAC3_2 || MGEODE_LX config X86_F00F_BUG def_bool y diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu index 707827f555d1..ec9f34db9a8b 100644 --- a/arch/x86/Makefile_32.cpu +++ b/arch/x86/Makefile_32.cpu @@ -10,7 +10,6 @@ else align := -falign-functions=0 -falign-jumps=0 -falign-loops=0 endif -cflags-$(CONFIG_M586) += -march=i586 cflags-$(CONFIG_M586TSC) += -march=i586 cflags-$(CONFIG_M586MMX) += -march=pentium-mmx cflags-$(CONFIG_M686) += -march=i686 diff --git a/arch/x86/include/asm/vermagic.h b/arch/x86/include/asm/vermagic.h index b3a8beb32dfd..e26061df0c9b 100644 --- a/arch/x86/include/asm/vermagic.h +++ b/arch/x86/include/asm/vermagic.h @@ -5,8 +5,6 @@ #ifdef CONFIG_X86_64 /* X86_64 does not define MODULE_PROC_FAMILY */ -#elif defined CONFIG_M586 -#define MODULE_PROC_FAMILY "586 " #elif defined CONFIG_M586TSC #define MODULE_PROC_FAMILY "586TSC " #elif defined CONFIG_M586MMX |