diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-05-29 09:51:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-05-29 09:51:03 +0200 |
| commit | fd9afb57ee2c5ca503204d9ad6fddd688867842e (patch) | |
| tree | 25c8424e260799191b26e1f56f7f482f3bf10141 /arch | |
| parent | 54f230a8b725c4e2c4099d11b01d8d696491855a (diff) | |
| parent | 2d3bb398861ad3ddbf87959cc2e34a7001f0b3ad (diff) | |
| download | linux-next-history-fd9afb57ee2c5ca503204d9ad6fddd688867842e.tar.gz | |
Merge branch into tip/master: 'objtool/core'
# New commits in objtool/core:
2d3bb398861a ("objtool/klp: Cache dont_correlate() result")
fe6a87e0abac ("objtool: Improve and simplify prefix symbol detection")
f7ceffd21a8a ("objtool/klp: Fix kCFI prefix finding/cloning")
fc0bb9915bce ("objtool: Grow __cfi_* prefix symbols for all CFI+CALL_PADDING")
cca84cb12908 ("objtool/klp: Fix position-dependent checksums for non-relocated jumps/calls")
3ee67629b2b7 ("objtool: Add insn_sym() helper")
5d6a03eeb717 ("objtool/klp: Add correlation debugging output")
6016dd33a10a ("objtool/klp: Rewrite symbol correlation algorithm")
873a2208ea31 ("objtool/klp: Calculate object checksums")
225d16dd510d ("klp-build: Validate short-circuit prerequisites")
3b8e56b86faa ("objtool/klp: Remove "objtool --checksum"")
d4888d58041d ("klp-build: Use "objtool klp checksum" subcommand")
e10764614ad6 ("objtool/klp: Add "objtool klp checksum" subcommand")
a5b661233262 ("objtool: Consolidate file decoding into decode_file()")
30cae58cdc13 ("objtool/klp: Extricate checksum calculation from validate_branch()")
6282e9f46b4f ("objtool: Add is_cold_func() helper")
8eebd5731133 ("objtool: Add is_alias_sym() helper")
ff0cf5efef40 ("objtool/klp: Handle Clang .data..Lanon anonymous data sections")
9e4512d7de5a ("objtool/klp: Create empty checksum sections for function-less object files")
ac999926774a ("objtool: Include libsubcmd headers directly from source tree")
8d4cbb6d0caf ("objtool/klp: Don't set sym->file for section symbols")
b6480aaedf3c ("klp-build: Remove redundant SRC and OBJ variables")
e950d2a10a30 ("klp-build: Print "objtool klp diff" command in verbose mode")
df0d7bb04a27 ("klp-build: Reject patches to realmode")
d8c3e262361b ("klp-build: Reject patches to vDSO")
f3048888ea62 ("klp-build: Fix patch cleanup on interrupt")
96524543740e ("klp-build: Suppress excessive fuzz output by default")
b3ece3019e8e ("klp-build: Validate patch file existence")
946d3510fe19 ("klp-build: Don't use errexit")
ba77fe55781a ("klp-build: Fix checksum comparison for changed offsets")
cc39ccce7d5b ("klp-build: Fix hang on out-of-date .config")
a375e327b63e ("objtool: Fix reloc hash collision in find_reloc_by_dest_range()")
5f49ec82b9f6 ("objtool/klp: Fix reloc corruption in convert_reloc_sym_to_secsym()")
51e1dfce24c8 ("objtool/klp: Don't correlate .rodata.cst* constant pool objects")
d5b0f025281f ("objtool/klp: Fix pointer comparisons for rodata objects")
8fdc3585b3b0 ("objtool/klp: Simplify reloc symbol conversion")
3e01ab44af20 ("objtool: Move mark_rodata() to elf.c")
3787e82a4e3a ("objtool/klp: Fix relocation conversion failures for R_X86_64_NONE")
da4326573ae8 ("objtool/klp: Fix kCFI trap handling")
62a7a01fde87 ("objtool/klp: Fix extraction of text annotations for alternatives")
479ac5260e7e ("objtool/klp: Fix XXH3 state memory leak")
98377f3ba7c0 ("objtool/klp: Fix cloning of zero-length section symbols")
c4c02d4450b5 ("objtool/klp: Fix handling of zero-length .altinstr_replacement sections")
def5b60dcd22 ("objtool/klp: Fix --debug-checksum for duplicate symbol names")
0333b7399587 ("objtool: Replace iterator callback with for_each_sym_by_mangled_name()")
3de711fba73a ("objtool/klp: Fix create_fake_symbols() skipping entsize-based sections")
e872b3f13922 ("objtool/klp: Improve local label check")
76eb0f8639fb ("objtool/klp: Don't report uncorrelated functions as new")
0a7823d1d70d ("objtool/klp: Don't correlate __initstub__ symbols")
710c4c254688 ("objtool/klp: Don't correlate absolute symbols")
8edec016255d ("objtool/klp: Don't correlate __ADDRESSABLE() symbols")
ff529864e738 ("objtool/klp: Fix .data..once static local non-correlation")
84c304a534b8 ("objtool/klp: Fix is_uncorrelated_static_local() for Clang")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f3f7cb01d69d0..3eb3c48d764ac 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2437,10 +2437,6 @@ config CALL_THUNKS def_bool n select CALL_PADDING -config PREFIX_SYMBOLS - def_bool y - depends on CALL_PADDING && !CFI - menuconfig CPU_MITIGATIONS bool "Mitigations for CPU vulnerabilities" default y |
