diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2019-07-18 20:50:48 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-07-18 20:50:48 +0200 |
| commit | 54f698f31e595f3f0caf28bfe2bde0c3373f9a60 (patch) | |
| tree | 143df87eb2e09ccf20e0eff0890685ac5fbca431 /include/linux | |
| parent | stacktrace: Force USER_DS for stack_trace_save_user() (diff) | |
| parent | bpf: Fix ORC unwinding in non-JIT BPF code (diff) | |
| download | linux-dev-54f698f31e595f3f0caf28bfe2bde0c3373f9a60.tar.xz linux-dev-54f698f31e595f3f0caf28bfe2bde0c3373f9a60.zip | |
Merge branch 'x86/debug' into core/urgent
Pick up the two pending objtool patches as the next round of objtool fixes
depend on them.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/compiler.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 8aaf7cd026b0..f0fd5636fddb 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -116,9 +116,14 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, ".pushsection .discard.unreachable\n\t" \ ".long 999b - .\n\t" \ ".popsection\n\t" + +/* Annotate a C jump table to allow objtool to follow the code flow */ +#define __annotate_jump_table __section(".rodata..c_jump_table") + #else #define annotate_reachable() #define annotate_unreachable() +#define __annotate_jump_table #endif #ifndef ASM_UNREACHABLE |