diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-12-01 09:18:12 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-12-01 09:22:19 +0100 |
commit | b3d006c0e745bfd2dab4984ffe3279d5cf4e926a (patch) | |
tree | 4d1e831872d397cc5bb9cdab6c0e239a0080909c /tools/perf/builtin-sched.c | |
parent | 4c635a4e04700a371ef7e4d4bb33ed88747e801e (diff) | |
parent | 133dc4c39c57eeef2577ca5b4ed24765b7a78ce2 (diff) | |
download | linux-b3d006c0e745bfd2dab4984ffe3279d5cf4e926a.tar.bz2 |
Merge branch 'perf/rename' into perf/core
Merge reason: This is an older commit under testing that was not pushed yet - merge it.
Also fix up the merge in command-list.txt.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Tom Zanussi <tzanussi@gmail.com>
Diffstat (limited to 'tools/perf/builtin-sched.c')
-rw-r--r-- | tools/perf/builtin-sched.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 55f3b5dcc731..26523c939791 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -1888,10 +1888,10 @@ int cmd_sched(int argc, const char **argv, const char *prefix __used) usage_with_options(sched_usage, sched_options); /* - * Aliased to 'perf trace' for now: + * Aliased to 'perf script' for now: */ - if (!strcmp(argv[0], "trace")) - return cmd_trace(argc, argv, prefix); + if (!strcmp(argv[0], "script")) + return cmd_script(argc, argv, prefix); symbol__init(); if (!strncmp(argv[0], "rec", 3)) { |