diff options
| author | David S. Miller <davem@davemloft.net> | 2021-05-19 12:58:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-05-19 12:58:29 -0700 |
| commit | 7b16509b29e007d15b158aa52bea25b22faf7972 (patch) | |
| tree | 66b85cf8c0d63a6a1ef770cd4c2115395e7c5a9b /samples/bpf/task_fd_query_user.c | |
| parent | 9287aa2bfd54a8a81f994defabcd92c737511d85 (diff) | |
| parent | 3a2daa7248647c0e5e165140553f9af5006e93a2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2021-05-19
The following pull-request contains BPF updates for your *net-next* tree.
We've added 43 non-merge commits during the last 11 day(s) which contain
a total of 74 files changed, 3717 insertions(+), 578 deletions(-).
The main changes are:
1) syscall program type, fd array, and light skeleton, from Alexei.
2) Stop emitting static variables in skeleton, from Andrii.
3) Low level tc-bpf api, from Kumar.
4) Reduce verifier kmalloc/kfree churn, from Lorenz.
====================
Diffstat (limited to 'samples/bpf/task_fd_query_user.c')
| -rw-r--r-- | samples/bpf/task_fd_query_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/bpf/task_fd_query_user.c b/samples/bpf/task_fd_query_user.c index a78025b0026b..c9a0ca8351fd 100644 --- a/samples/bpf/task_fd_query_user.c +++ b/samples/bpf/task_fd_query_user.c @@ -396,7 +396,7 @@ int main(int argc, char **argv) * on different systems with different compilers. The right way is * to parse the ELF file. We took a shortcut here. */ - uprobe_file_offset = (__u64)main - (__u64)&__executable_start; + uprobe_file_offset = (unsigned long)main - (unsigned long)&__executable_start; CHECK_AND_RET(test_nondebug_fs_probe("uprobe", (char *)argv[0], uprobe_file_offset, 0x0, false, BPF_FD_TYPE_UPROBE, |