diff options
| author | Ingo Molnar | 2014-06-12 13:53:16 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2014-06-12 13:53:16 +0200 |
| commit | 94eb153130ce2c5f5f4959c96ea8197475bd66b6 (patch) | |
| tree | 452c7fd4bd5d494d8b170fd5e840a5ae004e65ba /tools/perf/builtin-inject.c | |
| parent | perf: Differentiate exec() and non-exec() comm events (diff) | |
| parent | perf tools: Add dcacheline sort (diff) | |
| download | kernel-qcow2-linux-94eb153130ce2c5f5f4959c96ea8197475bd66b6.tar.gz kernel-qcow2-linux-94eb153130ce2c5f5f4959c96ea8197475bd66b6.tar.xz kernel-qcow2-linux-94eb153130ce2c5f5f4959c96ea8197475bd66b6.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Bitmask handling and plugin updates (Steven Rostedt)
* Fix pipe check regression in attr event callback (Jiri Olsa)
* Prettify the tags/TAGS/cscope targets output (Jiri Olsa)
* Print array argument as string (Namhyung Kim)
* Pass protection and flags bits through mmap2 interface (Peter Zijlstra)
* Update perf tool mmap2 interface with protection and flag bits (Don Zickus)
* Re-enable mmap interface (Don Zickus)
* Add mem-mode documentation to report command (Don Zickus)
* Add sort on dcacheline (Don Zickus)
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-inject.c')
| -rw-r--r-- | tools/perf/builtin-inject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 6a3af0013d68..16c7c11ad06e 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -72,7 +72,7 @@ static int perf_event__repipe_attr(struct perf_tool *tool, if (ret) return ret; - if (&inject->output.is_pipe) + if (!inject->output.is_pipe) return 0; return perf_event__repipe_synth(tool, event); |