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-lock.c | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'tools/perf/builtin-lock.c')
| -rw-r--r-- | tools/perf/builtin-lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 425830069749..76543a4a7a30 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c | |||
| @@ -878,7 +878,7 @@ static int __cmd_report(void) | |||
| 878 | static int __cmd_record(int argc, const char **argv) | 878 | static int __cmd_record(int argc, const char **argv) |
| 879 | { | 879 | { |
| 880 | const char *record_args[] = { | 880 | const char *record_args[] = { |
| 881 | "record", "-R", "-f", "-m", "1024", "-c", "1", | 881 | "record", "-R", "-m", "1024", "-c", "1", |
| 882 | }; | 882 | }; |
| 883 | unsigned int rec_argc, i, j; | 883 | unsigned int rec_argc, i, j; |
| 884 | const char **rec_argv; | 884 | const char **rec_argv; |