diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:29:26 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 20:29:26 -0500 |
| commit | 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee (patch) | |
| tree | 4f4e321a1ca0baf64d8af528080c71f93495a7d7 /tools/perf/scripts/python/syscall-counts.py | |
| parent | 98d27b8abf413a310df6676f7d2128ada1cccc08 (diff) | |
| parent | 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
| -rw-r--r-- | tools/perf/scripts/python/syscall-counts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/syscall-counts.py b/tools/perf/scripts/python/syscall-counts.py index ea183dc82d2..b435d3f188e 100644 --- a/tools/perf/scripts/python/syscall-counts.py +++ b/tools/perf/scripts/python/syscall-counts.py | |||
| @@ -15,7 +15,7 @@ from perf_trace_context import * | |||
| 15 | from Core import * | 15 | from Core import * |
| 16 | from Util import syscall_name | 16 | from Util import syscall_name |
| 17 | 17 | ||
| 18 | usage = "perf trace -s syscall-counts.py [comm]\n"; | 18 | usage = "perf script -s syscall-counts.py [comm]\n"; |
| 19 | 19 | ||
| 20 | for_comm = None | 20 | for_comm = None |
| 21 | 21 | ||