diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-12-12 03:09:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-12-12 03:09:03 -0500 |
| commit | 3459f0d78ffe27a1b341c22eb158b622eaaea3fc (patch) | |
| tree | 715b0575eec541d0181876ad367ca5480cdcecf3 /tools/perf/builtin-diff.c | |
| parent | 9fc81d87420d0d3fd62d5e5529972c0ad9eab9cc (diff) | |
| parent | bee2782f30f66898be3f74ad02e4d1f87a969694 (diff) | |
Merge branch 'linus' into perf/urgent, to pick up the upstream merged bits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-diff.c')
| -rw-r--r-- | tools/perf/builtin-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index 25114c9a6801..1ce425d101a9 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c | |||
| @@ -357,6 +357,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused, | |||
| 357 | static struct perf_tool tool = { | 357 | static struct perf_tool tool = { |
| 358 | .sample = diff__process_sample_event, | 358 | .sample = diff__process_sample_event, |
| 359 | .mmap = perf_event__process_mmap, | 359 | .mmap = perf_event__process_mmap, |
| 360 | .mmap2 = perf_event__process_mmap2, | ||
| 360 | .comm = perf_event__process_comm, | 361 | .comm = perf_event__process_comm, |
| 361 | .exit = perf_event__process_exit, | 362 | .exit = perf_event__process_exit, |
| 362 | .fork = perf_event__process_fork, | 363 | .fork = perf_event__process_fork, |