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

perf: Use consistent include paths for libbpf

Fix perf to include libbpf header files with the bpf/ prefix, to
be consistent with external users of the library.

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/157952560797.1683545.7685921032671386301.stgit@toke.dk

authored by

Toke Høiland-Jørgensen and committed by
Alexei Starovoitov
521fe8bb 229c3b47

+6 -6
+1 -1
tools/perf/examples/bpf/5sec.c
··· 39 39 Copyright (C) 2018 Red Hat, Inc., Arnaldo Carvalho de Melo <acme@redhat.com> 40 40 */ 41 41 42 - #include <bpf.h> 42 + #include <bpf/bpf.h> 43 43 44 44 int probe(hrtimer_nanosleep, rqtp->tv_sec)(void *ctx, int err, long sec) 45 45 {
+1 -1
tools/perf/examples/bpf/empty.c
··· 1 - #include <bpf.h> 1 + #include <bpf/bpf.h> 2 2 3 3 license(GPL);
+1 -1
tools/perf/examples/bpf/sys_enter_openat.c
··· 14 14 * the return value. 15 15 */ 16 16 17 - #include <bpf.h> 17 + #include <bpf/bpf.h> 18 18 19 19 struct syscall_enter_openat_args { 20 20 unsigned long long unused;
+1 -1
tools/perf/include/bpf/pid_filter.h
··· 3 3 #ifndef _PERF_BPF_PID_FILTER_ 4 4 #define _PERF_BPF_PID_FILTER_ 5 5 6 - #include <bpf.h> 6 + #include <bpf/bpf.h> 7 7 8 8 #define pid_filter(name) pid_map(name, bool) 9 9
+1 -1
tools/perf/include/bpf/stdio.h
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 3 - #include <bpf.h> 3 + #include <bpf/bpf.h> 4 4 5 5 struct bpf_map SEC("maps") __bpf_stdout__ = { 6 6 .type = BPF_MAP_TYPE_PERF_EVENT_ARRAY,
+1 -1
tools/perf/include/bpf/unistd.h
··· 1 1 // SPDX-License-Identifier: LGPL-2.1 2 2 3 - #include <bpf.h> 3 + #include <bpf/bpf.h> 4 4 5 5 static int (*bpf_get_current_pid_tgid)(void) = (void *)BPF_FUNC_get_current_pid_tgid; 6 6