diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-25 10:00:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-25 10:00:17 -0700 |
| commit | 300edd751b102715dda0fe44b4bf8442f6ccf9db (patch) | |
| tree | a1fad15b2130b701686419ff5e6737129a80ecd7 /arch/x86/kernel | |
| parent | 661e723b6fc7247e8aa6704651c49cd25c559f75 (diff) | |
| parent | b9f174c811e3ae4ae8959dc57e6adb9990e913f4 (diff) | |
Merge tag 'objtool_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fix from Borislav Petkov:
- Add a ORC format hash to vmlinux and modules in order for other tools
which use it, to detect changes to it and adapt accordingly
* tag 'objtool_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/unwind/orc: Add ELF section with ORC version identifier
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/unwind_orc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c index 3ac50b7298d1..4d8e518365f4 100644 --- a/arch/x86/kernel/unwind_orc.c +++ b/arch/x86/kernel/unwind_orc.c @@ -7,6 +7,9 @@ #include <asm/unwind.h> #include <asm/orc_types.h> #include <asm/orc_lookup.h> +#include <asm/orc_header.h> + +ORC_HEADER; #define orc_warn(fmt, ...) \ printk_deferred_once(KERN_WARNING "WARNING: " fmt, ##__VA_ARGS__) |