summaryrefslogtreecommitdiffstats
path: root/kernel
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 /kernel
parentcac9b9a4b08304f11daace03b8b48659355e44c1 (diff)
parente55a73251da335873a6e87d68fb17e5aabb8978e (diff)
downloadlinux-54f698f31e595f3f0caf28bfe2bde0c3373f9a60.tar.bz2
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 'kernel')
-rw-r--r--kernel/bpf/core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 16079550db6d..7e98f36a14e2 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -1299,7 +1299,7 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u64 *stack)
{
#define BPF_INSN_2_LBL(x, y) [BPF_##x | BPF_##y] = &&x##_##y
#define BPF_INSN_3_LBL(x, y, z) [BPF_##x | BPF_##y | BPF_##z] = &&x##_##y##_##z
- static const void *jumptable[256] = {
+ static const void * const jumptable[256] __annotate_jump_table = {
[0 ... 255] = &&default_label,
/* Now overwrite non-defaults ... */
BPF_INSN_MAP(BPF_INSN_2_LBL, BPF_INSN_3_LBL),
@@ -1558,7 +1558,6 @@ out:
BUG_ON(1);
return 0;
}
-STACK_FRAME_NON_STANDARD(___bpf_prog_run); /* jump table */
#define PROG_NAME(stack_size) __bpf_prog_run##stack_size
#define DEFINE_BPF_PROG_RUN(stack_size) \