Merge tag 'net-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[linux-2.6-microblaze.git] / include / linux / bpf.h

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index b33f199..02b02cb 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -675,7 +675,7 @@ struct bpf_dispatcher {
        struct bpf_ksym ksym;
 };
 
-static __always_inline unsigned int bpf_dispatcher_nop_func(
+static __always_inline __nocfi unsigned int bpf_dispatcher_nop_func(
        const void *ctx,
        const struct bpf_insn *insnsi,
        unsigned int (*bpf_func)(const void *,
@@ -703,7 +703,7 @@ void bpf_trampoline_put(struct bpf_trampoline *tr);
 }
 
 #define DEFINE_BPF_DISPATCHER(name)                                    \
-       noinline unsigned int bpf_dispatcher_##name##_func(             \
+       noinline __nocfi unsigned int bpf_dispatcher_##name##_func(     \
                const void *ctx,                                        \
                const struct bpf_insn *insnsi,                          \
                unsigned int (*bpf_func)(const void *,                  \