lkml.org 
[lkml]   [2018]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/11] perf bpf: Add license(NAME) helper
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    To further reduce boilerplate.

    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: https://lkml.kernel.org/n/tip-vst6hj335s0ebxzqltes3nsc@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/examples/bpf/5sec.c | 3 +--
    tools/perf/examples/bpf/empty.c | 3 +--
    tools/perf/include/bpf/bpf.h | 5 +++++
    3 files changed, 7 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/examples/bpf/5sec.c b/tools/perf/examples/bpf/5sec.c
    index 3d1ed34aec8b..6fc3697ac749 100644
    --- a/tools/perf/examples/bpf/5sec.c
    +++ b/tools/perf/examples/bpf/5sec.c
    @@ -40,5 +40,4 @@ int func(void *ctx, int err, long sec)
    return sec == 5;
    }

    -char _license[] SEC("license") = "GPL";
    -int _version SEC("version") = LINUX_VERSION_CODE;
    +license(GPL);
    diff --git a/tools/perf/examples/bpf/empty.c b/tools/perf/examples/bpf/empty.c
    index 86f97763355d..3776d26db9e7 100644
    --- a/tools/perf/examples/bpf/empty.c
    +++ b/tools/perf/examples/bpf/empty.c
    @@ -1,4 +1,3 @@
    #include <bpf.h>

    -char _license[] SEC("license") = "GPL";
    -int _version SEC("version") = LINUX_VERSION_CODE;
    +license(GPL);
    diff --git a/tools/perf/include/bpf/bpf.h b/tools/perf/include/bpf/bpf.h
    index 003afcab4e51..cdfd18b9c318 100644
    --- a/tools/perf/include/bpf/bpf.h
    +++ b/tools/perf/include/bpf/bpf.h
    @@ -2,4 +2,9 @@
    #ifndef _PERF_BPF_H
    #define _PERF_BPF_H
    #define SEC(NAME) __attribute__((section(NAME), used))
    +
    +#define license(name) \
    +char _license[] SEC("license") = #name; \
    +int _version SEC("version") = LINUX_VERSION_CODE;
    +
    #endif /* _PERF_BPF_H */
    --
    2.14.3
    \
     
     \ /
      Last update: 2018-05-16 16:50    [W:2.626 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site