Skip to contentSkip to conversation

perf bpf: Add license(NAME) helper

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 16, 2018 perf events

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  1f477305ab462e2fd1fa8a4c4fa425ad752b3175
Gitweb:     https://git.kernel.org/tip/1f477305ab462e2fd1fa8a4c4fa425ad752b3175
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 4 May 2018 15:18:31 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 15 May 2018 14:31:24 -0300

perf bpf: Add license(NAME) helper

To further reduce boilerplate.

Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Link https://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 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(-)
tools/perf/examples/bpf/5sec.c +1 -2
index 3d1ed34aec8b..6fc3697ac749 100644
@@ -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);
tools/perf/examples/bpf/empty.c +1 -2
index 86f97763355d..3776d26db9e7 100644
@@ -1,4 +1,3 @@
 #include <bpf.h>
 
-char _license[] SEC("license") = "GPL";
-int _version SEC("version") = LINUX_VERSION_CODE;
+license(GPL);
tools/perf/include/bpf/bpf.h +5 -0
index 003afcab4e51..cdfd18b9c318 100644
@@ -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 */