diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-14 04:04:05 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-14 04:04:05 +0300 |
| commit | 07dd1b7e68e4b83a1004b14dffd7e142c0bc79bd (patch) | |
| tree | 06a5898494308d55fcecbb3dff647d93c01afe47 /include/asm-generic/vmlinux.lds.h | |
| parent | bfe4c40333065639cf0f364b8ea9e93270781699 (diff) | |
| parent | 8afb259a9840fa953efb9a7835356a083ac8ec74 (diff) | |
| download | linux-07dd1b7e68e4b83a1004b14dffd7e142c0bc79bd.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2020-07-13
The following pull-request contains BPF updates for your *net-next* tree.
We've added 36 non-merge commits during the last 7 day(s) which contain
a total of 62 files changed, 2242 insertions(+), 468 deletions(-).
The main changes are:
1) Avoid trace_printk warning banner by switching bpf_trace_printk to use
its own tracing event, from Alan.
2) Better libbpf support on older kernels, from Andrii.
3) Additional AF_XDP stats, from Ciara.
4) build time resolution of BTF IDs, from Jiri.
5) BPF_CGROUP_INET_SOCK_RELEASE hook, from Stanislav.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index db600ef218d7..0be2ee265931 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -641,6 +641,10 @@ __start_BTF = .; \ *(.BTF) \ __stop_BTF = .; \ + } \ + . = ALIGN(4); \ + .BTF_ids : AT(ADDR(.BTF_ids) - LOAD_OFFSET) { \ + *(.BTF_ids) \ } #else #define BTF |