diff options
| author | Riley Andrews <riandrews@google.com> | 2015-01-09 19:10:36 -0800 |
|---|---|---|
| committer | Riley Andrews <riandrews@google.com> | 2015-01-13 22:35:58 +0000 |
| commit | b4804ef90f54068bfefd6a6f8c687e7844912c1d (patch) | |
| tree | 66b4d0be5d7fe8ba8bd2fb7db4761866e283fee2 /drivers/staging/android/binder_trace.h | |
| parent | 889cead9fa4bbb2a7f1a9dd3e715e38309497ad0 (diff) | |
Revert "Staging: android: binder: Support concurrent 32 bit and 64 bit processes."
This reverts commit 2d595dc92ae19b49e4c1ebb1f8e3b461a2d06592.
Change-Id: I1e4e306fa38f851b3044abb8a7c929c298c14812
Diffstat (limited to 'drivers/staging/android/binder_trace.h')
| -rw-r--r-- | drivers/staging/android/binder_trace.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/staging/android/binder_trace.h b/drivers/staging/android/binder_trace.h index 7f20f3dc8369..82a567c2af67 100644 --- a/drivers/staging/android/binder_trace.h +++ b/drivers/staging/android/binder_trace.h @@ -152,7 +152,7 @@ TRACE_EVENT(binder_transaction_node_to_ref, TP_STRUCT__entry( __field(int, debug_id) __field(int, node_debug_id) - __field(binder_uintptr_t, node_ptr) + __field(void __user *, node_ptr) __field(int, ref_debug_id) __field(uint32_t, ref_desc) ), @@ -163,9 +163,8 @@ TRACE_EVENT(binder_transaction_node_to_ref, __entry->ref_debug_id = ref->debug_id; __entry->ref_desc = ref->desc; ), - TP_printk("transaction=%d node=%d src_ptr=0x%016llx ==> dest_ref=%d dest_desc=%d", - __entry->debug_id, __entry->node_debug_id, - (u64)__entry->node_ptr, + TP_printk("transaction=%d node=%d src_ptr=0x%p ==> dest_ref=%d dest_desc=%d", + __entry->debug_id, __entry->node_debug_id, __entry->node_ptr, __entry->ref_debug_id, __entry->ref_desc) ); @@ -178,7 +177,7 @@ TRACE_EVENT(binder_transaction_ref_to_node, __field(int, ref_debug_id) __field(uint32_t, ref_desc) __field(int, node_debug_id) - __field(binder_uintptr_t, node_ptr) + __field(void __user *, node_ptr) ), TP_fast_assign( __entry->debug_id = t->debug_id; @@ -187,10 +186,9 @@ TRACE_EVENT(binder_transaction_ref_to_node, __entry->node_debug_id = ref->node->debug_id; __entry->node_ptr = ref->node->ptr; ), - TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%016llx", + TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%p", __entry->debug_id, __entry->node_debug_id, - __entry->ref_debug_id, __entry->ref_desc, - (u64)__entry->node_ptr) + __entry->ref_debug_id, __entry->ref_desc, __entry->node_ptr) ); TRACE_EVENT(binder_transaction_ref_to_ref, |