lkml.org 
[lkml]   [2020]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH bpf-next v5 07/11] perf: Use consistent include paths for libbpf
    From
    Date
    From: Toke Høiland-Jørgensen <toke@redhat.com>

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

    Acked-by: Andrii Nakryiko <andriin@fb.com>
    Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
    ---
    tools/perf/examples/bpf/5sec.c | 2 +-
    tools/perf/examples/bpf/empty.c | 2 +-
    tools/perf/examples/bpf/sys_enter_openat.c | 2 +-
    tools/perf/include/bpf/pid_filter.h | 2 +-
    tools/perf/include/bpf/stdio.h | 2 +-
    tools/perf/include/bpf/unistd.h | 2 +-
    6 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/tools/perf/examples/bpf/5sec.c b/tools/perf/examples/bpf/5sec.c
    index b9c203219691..49f4f84da485 100644
    --- a/tools/perf/examples/bpf/5sec.c
    +++ b/tools/perf/examples/bpf/5sec.c
    @@ -39,7 +39,7 @@
    Copyright (C) 2018 Red Hat, Inc., Arnaldo Carvalho de Melo <acme@redhat.com>
    */

    -#include <bpf.h>
    +#include <bpf/bpf.h>

    int probe(hrtimer_nanosleep, rqtp->tv_sec)(void *ctx, int err, long sec)
    {
    diff --git a/tools/perf/examples/bpf/empty.c b/tools/perf/examples/bpf/empty.c
    index 3776d26db9e7..7d7fb0c9fe76 100644
    --- a/tools/perf/examples/bpf/empty.c
    +++ b/tools/perf/examples/bpf/empty.c
    @@ -1,3 +1,3 @@
    -#include <bpf.h>
    +#include <bpf/bpf.h>

    license(GPL);
    diff --git a/tools/perf/examples/bpf/sys_enter_openat.c b/tools/perf/examples/bpf/sys_enter_openat.c
    index 9cd124b09392..c4481c390d23 100644
    --- a/tools/perf/examples/bpf/sys_enter_openat.c
    +++ b/tools/perf/examples/bpf/sys_enter_openat.c
    @@ -14,7 +14,7 @@
    * the return value.
    */

    -#include <bpf.h>
    +#include <bpf/bpf.h>

    struct syscall_enter_openat_args {
    unsigned long long unused;
    diff --git a/tools/perf/include/bpf/pid_filter.h b/tools/perf/include/bpf/pid_filter.h
    index 6e61c4bdf548..607189a315b2 100644
    --- a/tools/perf/include/bpf/pid_filter.h
    +++ b/tools/perf/include/bpf/pid_filter.h
    @@ -3,7 +3,7 @@
    #ifndef _PERF_BPF_PID_FILTER_
    #define _PERF_BPF_PID_FILTER_

    -#include <bpf.h>
    +#include <bpf/bpf.h>

    #define pid_filter(name) pid_map(name, bool)

    diff --git a/tools/perf/include/bpf/stdio.h b/tools/perf/include/bpf/stdio.h
    index 316af5b2ff35..7ca6fa5463ee 100644
    --- a/tools/perf/include/bpf/stdio.h
    +++ b/tools/perf/include/bpf/stdio.h
    @@ -1,6 +1,6 @@
    // SPDX-License-Identifier: GPL-2.0

    -#include <bpf.h>
    +#include <bpf/bpf.h>

    struct bpf_map SEC("maps") __bpf_stdout__ = {
    .type = BPF_MAP_TYPE_PERF_EVENT_ARRAY,
    diff --git a/tools/perf/include/bpf/unistd.h b/tools/perf/include/bpf/unistd.h
    index ca7877f9a976..d1a35b6c649d 100644
    --- a/tools/perf/include/bpf/unistd.h
    +++ b/tools/perf/include/bpf/unistd.h
    @@ -1,6 +1,6 @@
    // SPDX-License-Identifier: LGPL-2.1

    -#include <bpf.h>
    +#include <bpf/bpf.h>

    static int (*bpf_get_current_pid_tgid)(void) = (void *)BPF_FUNC_get_current_pid_tgid;

    \
     
     \ /
      Last update: 2020-01-20 14:07    [W:3.776 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site