diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-08 10:05:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-08 10:05:17 +0200 |
| commit | f1d800bf615b84ca253af372d2dac8cdef743a20 (patch) | |
| tree | 0ba71f573541cf42609230d8d96bc5e4c295536c /tools/perf/util/config.c | |
| parent | 1354ac6ad84395660f551d0614a6ca39e5bfe8e3 (diff) | |
| parent | 9bc898c7019383b6aa2ae6cb2928c4ca926449f0 (diff) | |
| download | linux-f1d800bf615b84ca253af372d2dac8cdef743a20.tar.gz linux-f1d800bf615b84ca253af372d2dac8cdef743a20.tar.xz | |
Merge tag 'perf-ebpf-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/ebpf library + llvm/clang infrastructure changes from Arnaldo Carvalho de Melo:
Infrastructure changes:
- Add library for interfacing with the kernel eBPF infrastructure, with
tools/perf/ targeted as a first user. (Wang Nan)
- Add llvm/clang infrastructure for building BPF object files from C source
code. (Wang Nan)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/config.c')
| -rw-r--r-- | tools/perf/util/config.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index e18f653cd7db..2e452ac1353d 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -12,6 +12,7 @@ #include "cache.h" #include "exec_cmd.h" #include "util/hist.h" /* perf_hist_config */ +#include "util/llvm-utils.h" /* perf_llvm_config */ #define MAXNAME (256) @@ -408,6 +409,9 @@ int perf_default_config(const char *var, const char *value, if (!prefixcmp(var, "call-graph.")) return perf_callchain_config(var, value); + if (!prefixcmp(var, "llvm.")) + return perf_llvm_config(var, value); + /* Add other config variables here. */ return 0; } |