diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-20 10:51:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-20 10:51:35 +0200 |
| commit | e4f8eaad70ea186b8da290c99239dce721a34f88 (patch) | |
| tree | 29083a5fab8cf752e01977addc4b958c05b9d346 /tools/perf/util/scripting-engines | |
| parent | 31d141e3a666269a3b6fcccddb0351caf7454240 (diff) | |
| parent | 3090ffb5a2515990182f3f55b0688a7817325488 (diff) | |
| download | op-kernel-dev-e4f8eaad70ea186b8da290c99239dce721a34f88.zip op-kernel-dev-e4f8eaad70ea186b8da290c99239dce721a34f88.tar.gz | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
" * Fix build error on Fedora 12.
* Fix to initialize fname always before use it, bug introduced
during this merge window, from Masami Hiramatsu.
* Disable PERF_RECORD_MMAP2 support, from Stephane Eranian. "
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/scripting-engines')
| -rw-r--r-- | tools/perf/util/scripting-engines/trace-event-perl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c index a85e4ae..c0c9795 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c @@ -282,7 +282,7 @@ static void perl_process_tracepoint(union perf_event *perf_event __maybe_unused, event = find_cache_event(evsel); if (!event) - die("ug! no event found for type %" PRIu64, evsel->attr.config); + die("ug! no event found for type %" PRIu64, (u64)evsel->attr.config); pid = raw_field_value(event, "common_pid", data); |
