aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/util/parse-events.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-10-30 10:09:37 +0100
committerIngo Molnar <mingo@kernel.org>2015-10-30 10:09:37 +0100
commitbebd23a2ed31d47e7dd746d3b125068aa2c42d85 (patch)
tree81cc1a59203c393286dba3e76daa343f5c35b127 /tools/perf/util/parse-events.h
parent66a565c203bc31b76969711fbd92da11bee2f129 (diff)
parent7ed4915ad60788d6b846e2cd034f49ee15698143 (diff)
downloadkernel_replicant_linux-bebd23a2ed31d47e7dd746d3b125068aa2c42d85.tar.gz
kernel_replicant_linux-bebd23a2ed31d47e7dd746d3b125068aa2c42d85.tar.bz2
kernel_replicant_linux-bebd23a2ed31d47e7dd746d3b125068aa2c42d85.zip
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: New features: - Allow passing C language eBPF scriptlets via --event in all tools, so that it gets built using clang and then pass it to the kernel via sys_bpf(). (Wang Nan) - Wire up the loaded ebpf object file with associated kprobes, so that it can determine if the kprobes will be filtered or not. (Wang Nan) User visible changes: - Add cmd string table to decode sys_bpf first arg in 'trace'. (Arnaldo Carvalho de Melo) - Enable printing of branch stack in 'perf script'. (Stephane Eranian) - Pass the right file with debug info to libunwind. (Rabin Vincent) Build Fixes: - Make sure fixdep is built before libbpf, fixing a race. (Jiri Olsa) - Fix libiberty feature detection. (Rabin Vincent) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/parse-events.h')
-rw-r--r--tools/perf/util/parse-events.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 765018a17448..f1a6db107241 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -125,7 +125,8 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx,
struct list_head *head_config);
int parse_events_load_bpf(struct parse_events_evlist *data,
struct list_head *list,
- char *bpf_file_name);
+ char *bpf_file_name,
+ bool source);
/* Provide this function for perf test */
struct bpf_object;
int parse_events_load_bpf_obj(struct parse_events_evlist *data,