diff options
| author | James Morris <jmorris@namei.org> | 2011-01-09 17:46:24 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-01-09 17:46:24 -0500 |
| commit | d2e7ad19229f982fc1eb731827d82ceac90abfb3 (patch) | |
| tree | 98a3741b4d4b27a48b3c7ea9babe331e539416a8 /tools/perf/scripts/python/sctop.py | |
| parent | d03a5d888fb688c832d470b749acc5ed38e0bc1d (diff) | |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) | |
Merge branch 'master' into next
Conflicts:
security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'tools/perf/scripts/python/sctop.py')
| -rw-r--r-- | tools/perf/scripts/python/sctop.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/sctop.py b/tools/perf/scripts/python/sctop.py index 7a6ec2c7d8ab..42c267e292fa 100644 --- a/tools/perf/scripts/python/sctop.py +++ b/tools/perf/scripts/python/sctop.py | |||
| @@ -17,7 +17,7 @@ from perf_trace_context import * | |||
| 17 | from Core import * | 17 | from Core import * |
| 18 | from Util import * | 18 | from Util import * |
| 19 | 19 | ||
| 20 | usage = "perf trace -s sctop.py [comm] [interval]\n"; | 20 | usage = "perf script -s sctop.py [comm] [interval]\n"; |
| 21 | 21 | ||
| 22 | for_comm = None | 22 | for_comm = None |
| 23 | default_interval = 3 | 23 | default_interval = 3 |