diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-02-17 12:22:28 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-02-17 12:22:28 -0800 |
| commit | 93d11e0d76e3c5a8350c77d1463d9f845bdc9307 (patch) | |
| tree | c6116c2fc89cd42c15201f710dc3096b7b9e491c /kernel/bpf/helpers.c | |
| parent | 6b5567b1b21b0efc544b154dc023b7dd4b4dcf4c (diff) | |
| parent | 7a2fb91285151e843d6f30c0689536a4747712cb (diff) | |
| download | linux-93d11e0d76e3c5a8350c77d1463d9f845bdc9307.tar.gz linux-93d11e0d76e3c5a8350c77d1463d9f845bdc9307.tar.bz2 linux-93d11e0d76e3c5a8350c77d1463d9f845bdc9307.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Fast path bpf marge for some -next work.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'kernel/bpf/helpers.c')
| -rw-r--r-- | kernel/bpf/helpers.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 4e5969fde0b3..49817755b8c3 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -2,6 +2,7 @@ /* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com */ #include <linux/bpf.h> +#include <linux/btf.h> #include <linux/bpf-cgroup.h> #include <linux/rcupdate.h> #include <linux/random.h> @@ -1109,6 +1110,7 @@ static enum hrtimer_restart bpf_timer_cb(struct hrtimer *hrtimer) void *key; u32 idx; + BTF_TYPE_EMIT(struct bpf_timer); callback_fn = rcu_dereference_check(t->callback_fn, rcu_read_lock_bh_held()); if (!callback_fn) goto out; |