Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf test bpf: Use epoll_wait() instead of epoll_pwait()

The prototype for epoll_wait() is available in older distros, so use it
instead of epoll_pwait() (removing the last NULL arg, the sigmask,
makes it the same thing anyway) to avoid breaking the build.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-pwiwizloxt0jujy8em80qut3@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+5 -5
+2 -2
tools/perf/tests/bpf-script-example.c
··· 31 31 .max_entries = 1, 32 32 }; 33 33 34 - SEC("func=sys_epoll_pwait") 35 - int bpf_func__sys_epoll_pwait(void *ctx) 34 + SEC("func=sys_epoll_wait") 35 + int bpf_func__sys_epoll_wait(void *ctx) 36 36 { 37 37 int ind =0; 38 38 int *flag = bpf_map_lookup_elem(&flip_table, &ind);
+3 -3
tools/perf/tests/bpf.c
··· 13 13 14 14 #ifdef HAVE_LIBBPF_SUPPORT 15 15 16 - static int epoll_pwait_loop(void) 16 + static int epoll_wait_loop(void) 17 17 { 18 18 int i; 19 19 20 20 /* Should fail NR_ITERS times */ 21 21 for (i = 0; i < NR_ITERS; i++) 22 - epoll_pwait(-(i + 1), NULL, 0, 0, NULL); 22 + epoll_wait(-(i + 1), NULL, 0, 0); 23 23 return 0; 24 24 } 25 25 ··· 61 61 "[basic_bpf_test]", 62 62 "fix 'perf test LLVM' first", 63 63 "load bpf object failed", 64 - &epoll_pwait_loop, 64 + &epoll_wait_loop, 65 65 (NR_ITERS + 1) / 2, 66 66 }, 67 67 #ifdef HAVE_BPF_PROLOGUE