diff options
| author | Andy Green <andy.green@linaro.org> | 2013-08-05 19:50:26 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-10-17 19:43:11 -0700 |
| commit | aecff9d0c1a87b5cd9af1c91b79a3d8fba82ffba (patch) | |
| tree | 3c83b8897fde8253cdc9d9ca23d07a7a63472d27 /drivers/staging | |
| parent | c457bb048e4ba70527e0f0bd2e4e55359905a29f (diff) | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/android/binder_trace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/android/binder_trace.h b/drivers/staging/android/binder_trace.h index 82a567c2af6..c661e376398 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, |