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-sched.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'tools/perf/builtin-sched.c')
| -rw-r--r-- | tools/perf/builtin-sched.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 2da2a6ca22bf..fed9ae432c16 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c | |||
| @@ -1632,7 +1632,6 @@ static int __cmd_record(int argc, const char **argv) | |||
| 1632 | "record", | 1632 | "record", |
| 1633 | "-a", | 1633 | "-a", |
| 1634 | "-R", | 1634 | "-R", |
| 1635 | "-f", | ||
| 1636 | "-m", "1024", | 1635 | "-m", "1024", |
| 1637 | "-c", "1", | 1636 | "-c", "1", |
| 1638 | "-e", "sched:sched_switch", | 1637 | "-e", "sched:sched_switch", |