Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d755034 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf tools: Don't cast RIP to pointers 



Since they can come from another architecture with bigger
pointers, i.e. processing a 64-bit perf.data on a 32-bit arch.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1263478990-8200-1-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 66aeb6d5

tools/perf/builtin-annotate.c

+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ static int process_sample_event(event_t *event, struct perf_session *session) 
{

	struct addr_location al;



	dump_printf("(IP, %d): %d: %p\n", event->header.misc,

		    event->ip.pid, (void *)(long)event->ip.ip);

	dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc,

		    event->ip.pid, event->ip.ip);



	if (event__preprocess_sample(event, session, &al, symbol_filter) < 0) {

		fprintf(stderr, "problem processing %d event, skipping it.\n",

tools/perf/builtin-diff.c

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ static int diff__process_sample_event(event_t *event, struct perf_session *sessi 
	struct addr_location al;

	struct sample_data data = { .period = 1, };



	dump_printf("(IP, %d): %d: %p\n", event->header.misc,

		    event->ip.pid, (void *)(long)event->ip.ip);

	dump_printf("(IP, %d): %d: %#Lx\n", event->header.misc,

		    event->ip.pid, event->ip.ip);



	if (event__preprocess_sample(event, session, &al, NULL) < 0) {

		pr_warning("problem processing %d event, skipping it.\n",

tools/perf/builtin-kmem.c

+2 −5
Original line number Diff line number Diff line
@@ -316,11 +316,8 @@ static int process_sample_event(event_t *event, struct perf_session *session) 


	event__parse_sample(event, session->sample_type, &data);



	dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",

		event->header.misc,

		data.pid, data.tid,

		(void *)(long)data.ip,

		(long long)data.period);

	dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,

		    data.pid, data.tid, data.ip, data.period);



	thread = perf_session__findnew(session, event->ip.pid);

	if (thread == NULL) {

tools/perf/builtin-report.c

+2 −5
Original line number Diff line number Diff line
@@ -93,11 +93,8 @@ static int process_sample_event(event_t *event, struct perf_session *session) 


	event__parse_sample(event, session->sample_type, &data);



	dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",

		event->header.misc,

		data.pid, data.tid,

		(void *)(long)data.ip,

		(long long)data.period);

	dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,

		    data.pid, data.tid, data.ip, data.period);



	if (session->sample_type & PERF_SAMPLE_CALLCHAIN) {

		unsigned int i;

tools/perf/builtin-sched.c

+2 −5
Original line number Diff line number Diff line
@@ -1621,11 +1621,8 @@ static int process_sample_event(event_t *event, struct perf_session *session) 


	event__parse_sample(event, session->sample_type, &data);



	dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",

		event->header.misc,

		data.pid, data.tid,

		(void *)(long)data.ip,

		(long long)data.period);

	dump_printf("(IP, %d): %d/%d: %#Lx period: %Ld\n", event->header.misc,

		    data.pid, data.tid, data.ip, data.period);



	thread = perf_session__findnew(session, data.pid);

	if (thread == NULL) {