aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/perf.c
diff options
context:
space:
mode:
authorGravatar Rafael J. Wysocki <rjw@sisk.pl> 2009-09-14 20:26:05 +0200
committerGravatar Rafael J. Wysocki <rjw@sisk.pl> 2009-09-14 20:26:05 +0200
commitac8d513a6801c8636922ccf4f30211810c9a56ce (patch)
tree83ba584487a6a612c8fcf2563c28c0263df35ba2 /tools/perf/perf.c
parentMerge branch 'master' into for-linus (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 (diff)
downloadlinux-ac8d513a6801c8636922ccf4f30211810c9a56ce.tar.gz
linux-ac8d513a6801c8636922ccf4f30211810c9a56ce.tar.bz2
linux-ac8d513a6801c8636922ccf4f30211810c9a56ce.zip
Merge branch 'master' into for-linus
Diffstat (limited to 'tools/perf/perf.c')
-rw-r--r--tools/perf/perf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 31982ad064b4..fe4589dde950 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -292,6 +292,7 @@ static void handle_internal_command(int argc, const char **argv)
{ "top", cmd_top, 0 },
{ "annotate", cmd_annotate, 0 },
{ "version", cmd_version, 0 },
+ { "trace", cmd_trace, 0 },
};
unsigned int i;
static const char ext[] = STRIP_EXTENSION;