diff options
author | James Morris <jmorris@namei.org> | 2009-08-11 08:33:01 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-08-11 08:33:01 +1000 |
commit | 8b4bfc7feb005d84e2bd0831d8331a304e9d6483 (patch) | |
tree | a13891d7264aefeea65e60cc956e8fa704032cd9 /tools/perf/builtin-stat.c | |
parent | 896a6de40ef3814525632609799af909338f50c3 (diff) | |
parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
download | linux-8b4bfc7feb005d84e2bd0831d8331a304e9d6483.tar.gz linux-8b4bfc7feb005d84e2bd0831d8331a304e9d6483.tar.bz2 linux-8b4bfc7feb005d84e2bd0831d8331a304e9d6483.zip |
Merge branch 'master' into next
Diffstat (limited to 'tools/perf/builtin-stat.c')
-rw-r--r-- | tools/perf/builtin-stat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index f9510eeeb6c7..b4b06c7903e1 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -496,7 +496,7 @@ static const struct option options[] = { "stat events on existing pid"), OPT_BOOLEAN('a', "all-cpus", &system_wide, "system-wide collection from all CPUs"), - OPT_BOOLEAN('S', "scale", &scale, + OPT_BOOLEAN('c', "scale", &scale, "scale/normalize counters"), OPT_BOOLEAN('v', "verbose", &verbose, "be more verbose (show counter open errors, etc)"), |