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/um | |
| 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/um')
| -rw-r--r-- | arch/um/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/um/kernel/asm-offsets.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index b6810db24ca4..1b9b82bbe322 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -5,7 +5,6 @@ generic-y += device.h generic-y += dma-mapping.h generic-y += emergency-restart.h generic-y += exec.h -generic-y += extable.h generic-y += ftrace.h generic-y += hw_irq.h generic-y += irq_regs.h diff --git a/arch/um/kernel/asm-offsets.c b/arch/um/kernel/asm-offsets.c index d38447e39d5e..d620b6f6de9b 100644 --- a/arch/um/kernel/asm-offsets.c +++ b/arch/um/kernel/asm-offsets.c @@ -9,6 +9,7 @@ #include <linux/fs.h> #include <asm/mman.h> #include <asm/seccomp.h> +#include <asm/extable.h> /* workaround for a warning with -Wmissing-prototypes */ void foo(void); @@ -42,4 +43,7 @@ void foo(void) DEFINE(HOSTFS_ATTR_CTIME, ATTR_CTIME); DEFINE(HOSTFS_ATTR_ATIME_SET, ATTR_ATIME_SET); DEFINE(HOSTFS_ATTR_MTIME_SET, ATTR_MTIME_SET); + + DEFINE(ALT_INSTR_SIZE, sizeof(struct alt_instr)); + DEFINE(EXTABLE_SIZE, sizeof(struct exception_table_entry)); } |