From 4a73b93ce489a58c9a2aac4a5f5cd8cfa58ced64 Mon Sep 17 00:00:00 2001 From: "Borislav Petkov (AMD)" Date: Mon, 29 Jun 2026 12:11:20 -0700 Subject: x86/alternative: Drop smp_locks glue This was there to be able to patch out locking instructions when running a SMP kernel build on a UP CPU. The times are long gone when single-CPU x86 machines were relevant so drop that machinery and simplify the code considerably. LOCK_PREFIX needs to stay for when one wants to do a UP build for whatever reason. That'll go away when CONFIG_SMP becomes unconditional. Kill a bunch of leftover, unused prototypes while at it. Signed-off-by: Borislav Petkov (AMD) Acked-by: Peter Zijlstra (Intel) Acked-by: Mike Rapoport (Microsoft) Link: https://lore.kernel.org/r/20260328081634.797552-1-rppt@kernel.org --- tools/arch/x86/include/asm/cpufeatures.h | 2 +- tools/objtool/check.c | 1 - tools/objtool/klp-diff.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h index 86d17b195e79..8860778305ca 100644 --- a/tools/arch/x86/include/asm/cpufeatures.h +++ b/tools/arch/x86/include/asm/cpufeatures.h @@ -78,7 +78,7 @@ #define X86_FEATURE_ZEN6 ( 3*32+ 6) /* CPU based on Zen6 microarchitecture */ /* Free ( 3*32+ 7) */ #define X86_FEATURE_CONSTANT_TSC ( 3*32+ 8) /* "constant_tsc" TSC ticks at a constant rate */ -#define X86_FEATURE_UP ( 3*32+ 9) /* "up" SMP kernel running on UP */ +/* free: was #define X86_FEATURE_UP ( 3*32+ 9) * "up" SMP kernel running on UP */ #define X86_FEATURE_ART ( 3*32+10) /* "art" Always running timer (ART) */ #define X86_FEATURE_ARCH_PERFMON ( 3*32+11) /* "arch_perfmon" Intel Architectural PerfMon */ #define X86_FEATURE_PEBS ( 3*32+12) /* "pebs" Precise-Event Based Sampling */ diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 10b18cf9c360..5f714e8b383a 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -4644,7 +4644,6 @@ static int validate_ibt(struct objtool_file *file) !strcmp(sec->name, ".kcfi_traps") || !strcmp(sec->name, ".orc_unwind_ip") || !strcmp(sec->name, ".retpoline_sites") || - !strcmp(sec->name, ".smp_locks") || !strcmp(sec->name, ".static_call_sites") || !strcmp(sec->name, "_error_injection_whitelist") || !strcmp(sec->name, "_kprobe_blacklist") || diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c index f8787d7d1454..07b7ef34cc92 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -297,7 +297,6 @@ static bool is_special_section(struct section *sec) static const char * const specials[] = { ".altinstructions", ".kcfi_traps", - ".smp_locks", "__bug_table", "__ex_table", "__jump_table", -- cgit