[3.11.y.z extended stable] Patch "perf scripting perl: Fix build error on Fedora 12" has been added to staging queue

Luis Henriques luis.henriques at canonical.com
Tue Jan 21 11:03:17 UTC 2014


This is a note to let you know that I have just added a patch titled

    perf scripting perl: Fix build error on Fedora 12

to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 354d095f5463b9dc4e7f51b61e32cbb101679baf Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme at redhat.com>
Date: Mon, 14 Oct 2013 18:25:12 -0300
Subject: perf scripting perl: Fix build error on Fedora 12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 3b16ff89676d9902dc39976aee3cb0314ee37d93 upstream.

Cast __u64 to u64 to silence this warning on older distros, such as
Fedora 12:

    CC       /tmp/build/perf/util/scripting-engines/trace-event-perl.o
  cc1: warnings being treated as errors
  util/scripting-engines/trace-event-perl.c: In function ‘perl_process_tracepoint’:
  util/scripting-engines/trace-event-perl.c:285: error: format ‘%lu’ expects type ‘long unsigned int’, but argument 2 has type ‘__u64’
  make[1]: *** [/tmp/build/perf/util/scripting-engines/trace-event-perl.o] Error 1
  make: *** [install] Error 2
  make: Leaving directory `/home/acme/git/linux/tools/perf'
  [acme at fedora12 linux]$

Reported-by: Waiman Long <Waiman.Long at hp.com>
Cc: Adrian Hunter <adrian.hunter at intel.com>
Cc: David Ahern <dsahern at gmail.com>
Cc: Frederic Weisbecker <fweisbec at gmail.com>
Cc: Jiri Olsa <jolsa at redhat.com>
Cc: Mike Galbraith <efault at gmx.de>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Peter Zijlstra <peterz at infradead.org>
Cc: Stephane Eranian <eranian at google.com>
Cc: Tom Zanussi <tom.zanussi at linux.intel.com>
Cc: Waiman Long <Waiman.Long at hp.com>
Link: http://lkml.kernel.org/n/tip-nlxofdqcdjfm0w9o6bgq4kqv@git.kernel.org
Link: http://lkml.kernel.org/r/1381265120-58532-1-git-send-email-Waiman.Long@hp.com
Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Cc: Xie XiuQi <xiexiuqi at huawei.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 tools/perf/util/scripting-engines/trace-event-perl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index eacec85..b4741b0 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);

--
1.8.3.2





More information about the kernel-team mailing list