From: John Stultz Date: Mon, 3 Mar 2014 09:00:52 +0000 (-0800) Subject: Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 X-Git-Tag: firefly_0821_release~3680^2~4^2~31^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=34f3211a85449939f787260237538dfb714ddb43;p=firefly-linux-kernel-4.4.55.git Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 This reverts Serban's out-of-tree binder changes and moves to the new binder protocol approach merged into AOSP. Signed-off-by: John Stultz --- 34f3211a85449939f787260237538dfb714ddb43 diff --cc drivers/staging/android/binder_trace.h index c661e376398f,7f20f3dc8369..02add80b62a0 --- a/drivers/staging/android/binder_trace.h +++ b/drivers/staging/android/binder_trace.h @@@ -184,11 -185,12 +185,12 @@@ TRACE_EVENT(binder_transaction_ref_to_n __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", + TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%016llx", __entry->debug_id, __entry->node_debug_id, - __entry->ref_debug_id, __entry->ref_desc, __entry->node_ptr) + __entry->ref_debug_id, __entry->ref_desc, + (u64)__entry->node_ptr) ); TRACE_EVENT(binder_transaction_ref_to_ref,