[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-vst6hj335s0ebxzqltes3nsc@git.kernel.org>
Date: Wed, 16 May 2018 11:03:58 -0700
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: dsahern@...il.com, tglx@...utronix.de, acme@...hat.com,
hpa@...or.com, jolsa@...nel.org, mingo@...nel.org,
namhyung@...nel.org, adrian.hunter@...el.com, wangnan0@...wei.com,
linux-kernel@...r.kernel.org
Subject: [tip:perf/core] perf bpf: Add license(NAME) helper
Commit-ID: 1f477305ab462e2fd1fa8a4c4fa425ad752b3175
Gitweb: https://git.kernel.org/tip/1f477305ab462e2fd1fa8a4c4fa425ad752b3175
Author: Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Fri, 4 May 2018 15:18:31 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 15 May 2018 14:31:24 -0300
perf bpf: Add license(NAME) helper
To further reduce boilerplate.
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: https://lkml.kernel.org/n/tip-vst6hj335s0ebxzqltes3nsc@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.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 */
Powered by blists - more mailing lists