diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-16 09:34:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-16 09:34:01 +0100 |
| commit | 3e7e09dbd1080de5dcf10092830e39bc2e2932ec (patch) | |
| tree | 546c99c62fd8a37511cafeb38e9532fda4b150fd /tools/perf/builtin-trace.c | |
| parent | 860fc2f2640ec348b9520ca4649b1bfd23d91bc2 (diff) | |
| parent | 0e9e79a13ab9d56b86db6538305babc23b1445cc (diff) | |
| download | linux-3e7e09dbd1080de5dcf10092830e39bc2e2932ec.tar.gz linux-3e7e09dbd1080de5dcf10092830e39bc2e2932ec.tar.bz2 linux-3e7e09dbd1080de5dcf10092830e39bc2e2932ec.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core updates from Arnaldo Carvalho de Melo:
Changes in user visible interfaces:
* Rename 'record's --no-delay option to --no-buffering, better reflecting its
purpose and freeing up '--delay' to take the place of '--initial-delay', so that
'record' and 'stat' are consistent.
Refactorings:
* Get rid of die() and friends (good riddance!) in libtraceevent (Namhyung Kim)
Infrastructure enhancements:
* Fix cross build problems related to pkgconfig and CROSS_COMPILE not being
propagated to the feature tests, leading to features being tested in the
host and then being enabled on the target. (Mark Rutland)
* Fix pointer-integer size mismatch in some libtraceevent plugins (Mark Rutland)
* Fix build error due to zfree() cast (Namhyung Kim)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-trace.c')
| -rw-r--r-- | tools/perf/builtin-trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 4bd44aba343e..896f27047ed6 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2258,7 +2258,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) }, .user_freq = UINT_MAX, .user_interval = ULLONG_MAX, - .no_delay = true, + .no_buffering = true, .mmap_pages = 1024, }, .output = stdout, |