staging: android: binder: Fix build warnings

This commit in mainline (now) causes a couple of warnings

commit 975a1ac9a9fe65d66ee1726c0db6dc58e53d232a
Author: Arve Hjønnevåg <arve@android.com>
Date:   Tue Oct 16 15:29:53 2012 -0700

    Staging: android: binder: Add some tracepoints

This patch fixes them

Signed-off-by: Andy Green <andy.green@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>

diff --git a/drivers/staging/android/binder_trace.h b/drivers/staging/android/binder_trace.h
index 82a567c2af6797bdfb5e004adffa51c447b53645..c661e376398fff129c5411482d9743248c8e9b44 100644 (file)
--- 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,