diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-06 11:56:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-06 11:56:51 -0800 |
| commit | 08b8ddac1f4339fbf950df45590a032578ec35f7 (patch) | |
| tree | 643153e95128a63699436e9b06920b23f1904670 /arch/x86/lib/error-inject.c | |
| parent | 92fc1f16e22f97dd5897c9200e620ebc287e50ef (diff) | |
| parent | 2d3451ef1ef679ae496f8e335f4b1305885e8083 (diff) | |
Merge tag 'objtool-urgent-2025-12-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fixes from Ingo Molnar:
"Address various objtool scalability bugs/inefficiencies exposed by
allmodconfig builds, plus improve the quality of alternatives
instructions generated code and disassembly"
* tag 'objtool-urgent-2025-12-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Simplify .annotate_insn code generation output some more
objtool: Add more robust signal error handling, detect and warn about stack overflows
objtool: Remove newlines and tabs from annotation macros
objtool: Consolidate annotation macros
x86/asm: Remove ANNOTATE_DATA_SPECIAL usage
x86/alternative: Remove ANNOTATE_DATA_SPECIAL usage
objtool: Fix stack overflow in validate_branch()
Diffstat (limited to 'arch/x86/lib/error-inject.c')
| -rw-r--r-- | arch/x86/lib/error-inject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/error-inject.c b/arch/x86/lib/error-inject.c index b5a6d83106bc..512a2538596f 100644 --- a/arch/x86/lib/error-inject.c +++ b/arch/x86/lib/error-inject.c @@ -13,7 +13,7 @@ asm( ".globl just_return_func\n" ASM_FUNC_ALIGN "just_return_func:\n" - ANNOTATE_NOENDBR + ANNOTATE_NOENDBR "\n" ASM_RET ".size just_return_func, .-just_return_func\n" ); |