diff options
author | Linus Torvalds | 2022-06-19 09:54:16 -0500 |
---|---|---|
committer | Linus Torvalds | 2022-06-19 09:54:16 -0500 |
commit | 5d770f11a1623eef83894b60686fb328794ccd23 (patch) | |
tree | 7be1ca589331f2ac8bed36ea2e40a9faf769a3b1 /include | |
parent | 727c3991dfdb3ff104e33307e287692ef01daec9 (diff) | |
parent | 7b6c7a877cc616bc7dc9cd39646fe454acbed48b (diff) |
Merge tag 'objtool-urgent-2022-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull build tooling updates from Thomas Gleixner:
- Remove obsolete CONFIG_X86_SMAP reference from objtool
- Fix overlapping text section failures in faddr2line for real
- Remove OBJECT_FILES_NON_STANDARD usage from x86 ftrace and replace it
with finegrained annotations so objtool can validate that code
correctly.
* tag 'objtool-urgent-2022-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/ftrace: Remove OBJECT_FILES_NON_STANDARD usage
faddr2line: Fix overlapping text section failures, the sequel
objtool: Fix obsolete reference to CONFIG_X86_SMAP
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/objtool.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/objtool.h b/include/linux/objtool.h index 6491fa8fba6d..15b940ec1eac 100644 --- a/include/linux/objtool.h +++ b/include/linux/objtool.h @@ -143,6 +143,12 @@ struct unwind_hint { .popsection .endm +.macro STACK_FRAME_NON_STANDARD_FP func:req +#ifdef CONFIG_FRAME_POINTER + STACK_FRAME_NON_STANDARD \func +#endif +.endm + .macro ANNOTATE_NOENDBR .Lhere_\@: .pushsection .discard.noendbr |