summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-06-25 10:00:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-06-25 10:00:17 -0700
commit300edd751b102715dda0fe44b4bf8442f6ccf9db (patch)
treea1fad15b2130b701686419ff5e6737129a80ecd7 /include
parent661e723b6fc7247e8aa6704651c49cd25c559f75 (diff)
parentb9f174c811e3ae4ae8959dc57e6adb9990e913f4 (diff)
downloadlinux-stable-300edd751b102715dda0fe44b4bf8442f6ccf9db.tar.gz
linux-stable-300edd751b102715dda0fe44b4bf8442f6ccf9db.tar.bz2
linux-stable-300edd751b102715dda0fe44b4bf8442f6ccf9db.zip
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 'include')
-rw-r--r--include/asm-generic/vmlinux.lds.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index cebdf1ca415d..da9e5629ea43 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -839,6 +839,9 @@
#ifdef CONFIG_UNWINDER_ORC
#define ORC_UNWIND_TABLE \
+ .orc_header : AT(ADDR(.orc_header) - LOAD_OFFSET) { \
+ BOUNDED_SECTION_BY(.orc_header, _orc_header) \
+ } \
. = ALIGN(4); \
.orc_unwind_ip : AT(ADDR(.orc_unwind_ip) - LOAD_OFFSET) { \
BOUNDED_SECTION_BY(.orc_unwind_ip, _orc_unwind_ip) \