diff options
| author | David S. Miller | 2019-07-18 23:04:45 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-07-18 23:04:45 +0200 |
| commit | bb745231678cd92ab0c4d37343b06e4879072368 (patch) | |
| tree | 34b96b1bc5310b40779b8848389868e58ce37b5d /tools/testing/selftests/bpf/prog_tests/perf_buffer.c | |
| parent | net/mlx5: Replace kfree with kvfree (diff) | |
| parent | selftests/bpf: fix test_xdp_noinline on s390 (diff) | |
| download | kernel-qcow2-linux-bb745231678cd92ab0c4d37343b06e4879072368.tar.gz kernel-qcow2-linux-bb745231678cd92ab0c4d37343b06e4879072368.tar.xz kernel-qcow2-linux-bb745231678cd92ab0c4d37343b06e4879072368.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2019-07-18
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) verifier precision propagation fix, from Andrii.
2) BTF size fix for typedefs, from Andrii.
3) a bunch of big endian fixes, from Ilya.
4) wide load from bpf_sock_addr fixes, from Stanislav.
5) a bunch of misc fixes from a number of developers.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/perf_buffer.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/perf_buffer.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/perf_buffer.c b/tools/testing/selftests/bpf/prog_tests/perf_buffer.c index 3f1ef95865ff..3003fddc0613 100644 --- a/tools/testing/selftests/bpf/prog_tests/perf_buffer.c +++ b/tools/testing/selftests/bpf/prog_tests/perf_buffer.c @@ -5,12 +5,6 @@ #include <sys/socket.h> #include <test_progs.h> -#ifdef __x86_64__ -#define SYS_KPROBE_NAME "__x64_sys_nanosleep" -#else -#define SYS_KPROBE_NAME "sys_nanosleep" -#endif - static void on_sample(void *ctx, int cpu, void *data, __u32 size) { int cpu_data = *(int *)data, duration = 0; @@ -56,7 +50,7 @@ void test_perf_buffer(void) /* attach kprobe */ link = bpf_program__attach_kprobe(prog, false /* retprobe */, - SYS_KPROBE_NAME); + SYS_NANOSLEEP_KPROBE_NAME); if (CHECK(IS_ERR(link), "attach_kprobe", "err %ld\n", PTR_ERR(link))) goto out_close; |