The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 2ed46bccac394fd960c20dd9dc4c5fe0a9d7c0ef
Gitweb: https://git.kernel.org/tip/2ed46bccac394fd960c20dd9dc4c5fe0a9d7c0ef
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Fri, 25 Apr 2025 10:42:03 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 06 May 2026 08:05:30 +02:00
x86/cpu: Remove the CONFIG_X86_INVD_BUG quirk
Now that support for 486 CPUs is gone, remove this
quirk as well.
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: Ahmed S. Darwish <darwi@linutronix.de>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250425084216.3913608-7-mingo@kernel.org
---
arch/x86/Kconfig.cpu | 4 ----
arch/x86/kernel/traps.c | 7 -------
2 files changed, 11 deletions(-)
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 9b91209..1377edd 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -248,10 +248,6 @@ config X86_F00F_BUG
def_bool y
depends on M586MMX || M586TSC || M586
-config X86_INVD_BUG
- def_bool y
- depends on M486SX || M486
-
config X86_ALIGNMENT_16
def_bool y
depends on MCYRIXIII || MK6 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODEGX1
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 0ca3912..52177bc 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -1475,13 +1475,6 @@ DEFINE_IDTENTRY(exc_coprocessor_error)
DEFINE_IDTENTRY(exc_simd_coprocessor_error)
{
- if (IS_ENABLED(CONFIG_X86_INVD_BUG)) {
- /* AMD 486 bug: INVD in CPL 0 raises #XF instead of #GP */
- if (!static_cpu_has(X86_FEATURE_XMM)) {
- __exc_general_protection(regs, 0);
- return;
- }
- }
math_error(regs, X86_TRAP_XF);
}