diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /tools/perf/builtin-timechart.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'tools/perf/builtin-timechart.c')
| -rw-r--r-- | tools/perf/builtin-timechart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c index ab4cf232b852..4536a92b18f3 100644 --- a/tools/perf/builtin-timechart.c +++ b/tools/perf/builtin-timechart.c | |||
| @@ -1005,7 +1005,7 @@ static int __cmd_record(int argc, const char **argv) | |||
| 1005 | { | 1005 | { |
| 1006 | #ifdef SUPPORT_OLD_POWER_EVENTS | 1006 | #ifdef SUPPORT_OLD_POWER_EVENTS |
| 1007 | const char * const record_old_args[] = { | 1007 | const char * const record_old_args[] = { |
| 1008 | "record", "-a", "-R", "-f", "-c", "1", | 1008 | "record", "-a", "-R", "-c", "1", |
| 1009 | "-e", "power:power_start", | 1009 | "-e", "power:power_start", |
| 1010 | "-e", "power:power_end", | 1010 | "-e", "power:power_end", |
| 1011 | "-e", "power:power_frequency", | 1011 | "-e", "power:power_frequency", |
| @@ -1014,7 +1014,7 @@ static int __cmd_record(int argc, const char **argv) | |||
| 1014 | }; | 1014 | }; |
| 1015 | #endif | 1015 | #endif |
| 1016 | const char * const record_new_args[] = { | 1016 | const char * const record_new_args[] = { |
| 1017 | "record", "-a", "-R", "-f", "-c", "1", | 1017 | "record", "-a", "-R", "-c", "1", |
| 1018 | "-e", "power:cpu_frequency", | 1018 | "-e", "power:cpu_frequency", |
| 1019 | "-e", "power:cpu_idle", | 1019 | "-e", "power:cpu_idle", |
| 1020 | "-e", "sched:sched_wakeup", | 1020 | "-e", "sched:sched_wakeup", |