[PATCH] x86/cpu: drop unused Kconfig symbol X86_P6_NOP

From: Randy Dunlap
Date: Sun Dec 28 2025 - 18:27:42 EST


This symbol was removed in early 2025 but 2 dangling references to it
were missed. Delete them now.

Fixes: f388f60ca904 ("x86/cpu: Drop configuration options for early 64-bit CPUs")
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
---
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: x86@xxxxxxxxxx

arch/x86/Kconfig.cpufeatures | 2 +-
arch/x86/Makefile_32.cpu | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)

--- linux-next-20251219.orig/arch/x86/Kconfig.cpufeatures
+++ linux-next-20251219/arch/x86/Kconfig.cpufeatures
@@ -38,7 +38,7 @@ config X86_REQUIRED_FEATURE_ALWAYS

config X86_REQUIRED_FEATURE_NOPL
def_bool y
- depends on X86_64 || X86_P6_NOP
+ depends on X86_64

config X86_REQUIRED_FEATURE_CX8
def_bool y
--- linux-next-20251219.orig/arch/x86/Makefile_32.cpu
+++ linux-next-20251219/arch/x86/Makefile_32.cpu
@@ -42,9 +42,3 @@ cflags-$(CONFIG_MGEODE_LX) += $(call cc-
# add at the end to overwrite eventual tuning options from earlier
# cpu entries
cflags-$(CONFIG_X86_GENERIC) += $(call tune,generic,$(call tune,i686))
-
-# Bug fix for binutils: this option is required in order to keep
-# binutils from generating NOPL instructions against our will.
-ifneq ($(CONFIG_X86_P6_NOP),y)
-cflags-y += $(call cc-option,-Wa$(comma)-mtune=generic32,)
-endif