summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-18 20:50:48 +0200
committerThomas Gleixner <tglx@linutronix.de>2019-07-18 20:50:48 +0200
commit54f698f31e595f3f0caf28bfe2bde0c3373f9a60 (patch)
tree143df87eb2e09ccf20e0eff0890685ac5fbca431 /include
parentcac9b9a4b08304f11daace03b8b48659355e44c1 (diff)
parente55a73251da335873a6e87d68fb17e5aabb8978e (diff)
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')
-rw-r--r--include/linux/compiler.h5
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