diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-06-29 09:11:26 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-06-29 09:11:26 -0400 |
commit | add79461a2a7d964a00b4a2fdaf313c4cf9cf4ec (patch) | |
tree | cda1525b5483ad4952ff9d71348693f14d8b26ba /tools/perf/builtin-bench.c | |
parent | 357398e96d8c883b010379a7669df43ed0e2e32b (diff) | |
parent | d9873ab79376d5c0112ed09e14783067dc65e808 (diff) |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
perf/core improvements and fixes:
* Improve 'perf bench' docs, by Namhyung Kim
* Fix build when O= is not used, from David Ahern
* Fix cross compilation build, from Namhyung Kim
* Fix pipe mode when callchains are used, from David Ahern
* Follow .gnu_debuglink section to find separate symbols, from Pierre-Loup A. Griffais
* Fix 'perf test' raw events entries, from Jiri Olsa
* Use the events description in the perf.data file, not the sysfs ones.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-bench.c')
-rw-r--r-- | tools/perf/builtin-bench.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c index b0e74ab2d7a2..1f3100216448 100644 --- a/tools/perf/builtin-bench.c +++ b/tools/perf/builtin-bench.c | |||
@@ -33,7 +33,7 @@ struct bench_suite { | |||
33 | }; | 33 | }; |
34 | \ | 34 | \ |
35 | /* sentinel: easy for help */ | 35 | /* sentinel: easy for help */ |
36 | #define suite_all { "all", "test all suite (pseudo suite)", NULL } | 36 | #define suite_all { "all", "Test all benchmark suites", NULL } |
37 | 37 | ||
38 | static struct bench_suite sched_suites[] = { | 38 | static struct bench_suite sched_suites[] = { |
39 | { "messaging", | 39 | { "messaging", |
@@ -75,7 +75,7 @@ static struct bench_subsys subsystems[] = { | |||
75 | "memory access performance", | 75 | "memory access performance", |
76 | mem_suites }, | 76 | mem_suites }, |
77 | { "all", /* sentinel: easy for help */ | 77 | { "all", /* sentinel: easy for help */ |
78 | "test all subsystem (pseudo subsystem)", | 78 | "all benchmark subsystem", |
79 | NULL }, | 79 | NULL }, |
80 | { NULL, | 80 | { NULL, |
81 | NULL, | 81 | NULL, |