From: Andy Green Date: Tue, 6 Aug 2013 02:50:26 +0000 (-0700) Subject: staging: android: binder: Fix build warnings X-Git-Tag: firefly_0821_release~3680^2~4^2~41^2~8 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aecff9d0c1a87b5cd9af1c91b79a3d8fba82ffba;p=firefly-linux-kernel-4.4.55.git staging: android: binder: Fix build warnings This commit in mainline (now) causes a couple of warnings commit 975a1ac9a9fe65d66ee1726c0db6dc58e53d232a Author: Arve Hjønnevåg Date: Tue Oct 16 15:29:53 2012 -0700 Staging: android: binder: Add some tracepoints This patch fixes them Signed-off-by: Andy Green Signed-off-by: John Stultz --- diff --git a/drivers/staging/android/binder_trace.h b/drivers/staging/android/binder_trace.h index 82a567c2af67..c661e376398f 100644 --- a/drivers/staging/android/binder_trace.h +++ b/drivers/staging/android/binder_trace.h @@ -159,7 +159,7 @@ TRACE_EVENT(binder_transaction_node_to_ref, TP_fast_assign( __entry->debug_id = t->debug_id; __entry->node_debug_id = node->debug_id; - __entry->node_ptr = node->ptr; + __entry->node_ptr = (void __user *)node->ptr; __entry->ref_debug_id = ref->debug_id; __entry->ref_desc = ref->desc; ), @@ -184,7 +184,7 @@ TRACE_EVENT(binder_transaction_ref_to_node, __entry->ref_debug_id = ref->debug_id; __entry->ref_desc = ref->desc; __entry->node_debug_id = ref->node->debug_id; - __entry->node_ptr = ref->node->ptr; + __entry->node_ptr = (void __user *)ref->node->ptr; ), TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%p", __entry->debug_id, __entry->node_debug_id,