diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 18:11:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 18:11:25 -0700 |
| commit | ccb9331e132a0554f6efb18140eae78bc32b0ee4 (patch) | |
| tree | 9af27985432a7ac6214fecb66cc5eb911eec0ad1 /tools/objtool | |
| parent | b960327ab340b54f8e20f3af5d0751e2941b6675 (diff) | |
| parent | 4a73b93ce489a58c9a2aac4a5f5cd8cfa58ced64 (diff) | |
Merge tag 'x86_alternatives_for_v7.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 alternatives update from Borislav Petkov:
- Remove the smp_locks alternatives machinery which was used to patch
out lock prefixes when running a SMP kernel on a uniprocessor machine
* tag 'x86_alternatives_for_v7.3_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/alternative: Drop smp_locks glue
Diffstat (limited to 'tools/objtool')
| -rw-r--r-- | tools/objtool/check.c | 1 | ||||
| -rw-r--r-- | tools/objtool/klp-diff.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 288a48dff11c..df04e6be2f66 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -4647,7 +4647,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 16681a76f13d..34da55e45609 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -344,7 +344,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", |