diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-02 11:00:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-02 11:00:46 -0700 |
| commit | 29684d802e4ab484c679859217c1588c199f1d4f (patch) | |
| tree | 3e62a5acb825af0ebe2c0ae208fce88b0632bc3a /include | |
| parent | 9256ce33110174decc04caf6ef733409012e5b1c (diff) | |
| parent | 6dcc4e38386950abf9060784631622dfc4df9577 (diff) | |
| download | linux-29684d802e4ab484c679859217c1588c199f1d4f.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2021-04-01
The following pull-request contains BPF updates for your *net* tree.
We've added 11 non-merge commits during the last 8 day(s) which contain
a total of 10 files changed, 151 insertions(+), 26 deletions(-).
The main changes are:
1) xsk creation fixes, from Ciara.
2) bpf_get_task_stack fix, from Dave.
3) trampoline in modules fix, from Jiri.
4) bpf_obj_get fix for links and progs, from Lorenz.
5) struct_ops progs must be gpl compatible fix, from Toke.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bpf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 3625f019767d..fdac0534ce79 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -40,6 +40,7 @@ struct bpf_local_storage; struct bpf_local_storage_map; struct kobject; struct mem_cgroup; +struct module; extern struct idr btf_idr; extern spinlock_t btf_idr_lock; @@ -623,6 +624,7 @@ struct bpf_trampoline { /* Executable image of trampoline */ struct bpf_tramp_image *cur_image; u64 selector; + struct module *mod; }; struct bpf_attach_target_info { |