diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-28 09:46:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-28 09:46:43 +0200 |
| commit | 1d787d37c8ff6612b8151c6dff15bfa7347bcbdf (patch) | |
| tree | f33947a6603b406ba1e8b80114b2de313bcd9f09 /tools/perf/perf.c | |
| parent | ac2ba2b363a40a2431506d446985af4e4108b0d2 (diff) | |
| parent | aec1930b0f6f281a0ca038cd03aceace3fe0bb61 (diff) | |
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:
* Improve listing of accessible enum perf probe variables, from Hyeoncheol Lee.
* Don't stop the build if the audit libraries are not installed, fix from Namhyung Kim.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/perf.c')
| -rw-r--r-- | tools/perf/perf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/perf.c b/tools/perf/perf.c index fb8578cfa03..fc2f770e302 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -55,6 +55,9 @@ static struct cmd_struct commands[] = { { "lock", cmd_lock, 0 }, { "kvm", cmd_kvm, 0 }, { "test", cmd_test, 0 }, +#ifndef NO_LIBAUDIT_SUPPORT + { "trace", cmd_trace, 0 }, +#endif { "inject", cmd_inject, 0 }, }; |