diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 14:52:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 14:52:24 -0500 |
commit | 9d6e323c687c7b94c703c9b0900a74e5d262d462 (patch) | |
tree | 82b6dfff0fa732cfabde42001482aad144bb3945 /tools/perf/builtin-report.c | |
parent | b21c07040304b8716e38a4a0e4ab60f386357e61 (diff) | |
parent | 4efb5290ae187514bd31af8c2d7755e175245e19 (diff) |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf kmem: Fix statistics typo
kprobes: Fix distinct type warning
perf: Rename perf_event_hw_event in design document
perf tools: Add missing header files to LIB_H Makefile variable
perf record: We should fork only if a program was specified to run
perf diff: Fix usage array, it must end with a NULL entry
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r-- | tools/perf/builtin-report.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 5c2ab5357ec6..db10c0e8ecae 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -294,8 +294,7 @@ setup: | |||
294 | return 0; | 294 | return 0; |
295 | } | 295 | } |
296 | 296 | ||
297 | //static const char * const report_usage[] = { | 297 | static const char * const report_usage[] = { |
298 | const char * const report_usage[] = { | ||
299 | "perf report [<options>] <command>", | 298 | "perf report [<options>] <command>", |
300 | NULL | 299 | NULL |
301 | }; | 300 | }; |