diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-12 15:53:16 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-12 15:53:16 +0400 |
| commit | 94eb153130ce2c5f5f4959c96ea8197475bd66b6 (patch) | |
| tree | 452c7fd4bd5d494d8b170fd5e840a5ae004e65ba /tools/perf/tests | |
| parent | 82b897782d10fcc4930c9d4a15b175348fdd2871 (diff) | |
| parent | 9b32ba71ba905b90610fc2aad77cb98a373c5624 (diff) | |
| download | linux-94eb153130ce2c5f5f4959c96ea8197475bd66b6.tar.xz | |
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/tests')
| -rw-r--r-- | tools/perf/tests/dwarf-unwind.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/tests/dwarf-unwind.c b/tools/perf/tests/dwarf-unwind.c index 108f0cd49f4e..96adb730b744 100644 --- a/tools/perf/tests/dwarf-unwind.c +++ b/tools/perf/tests/dwarf-unwind.c @@ -15,7 +15,7 @@ static int mmap_handler(struct perf_tool *tool __maybe_unused, struct perf_sample *sample __maybe_unused, struct machine *machine) { - return machine__process_mmap_event(machine, event, NULL); + return machine__process_mmap2_event(machine, event, NULL); } static int init_live_machine(struct machine *machine) |