Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ad2c89e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Staging: android: binder: Support concurrent 32 bit and 64 bit processes."

parents d2986f25 f7d95e1b

drivers/staging/android/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ config ANDROID_BINDER_IPC 
	  Android process, using Binder to identify, invoke and pass arguments

	  between said processes.



config ANDROID_BINDER_IPC_32BIT

	bool "Use old 32-bit binder api"

	depends on !64BIT

	---help---

	  Enable to support an old 32-bit Android user-space. Breaks the new

	  Android user-space.



config ASHMEM

	bool "Enable the Anonymous Shared Memory Subsystem"

	default n

drivers/staging/android/binder.c

+136 −117

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/android/binder.h

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
#ifndef _LINUX_BINDER_H

#define _LINUX_BINDER_H



#ifdef CONFIG_ANDROID_BINDER_IPC_32BIT

#define BINDER_IPC_32BIT 1

#endif



#include "uapi/binder.h"



#endif /* _LINUX_BINDER_H */

drivers/staging/android/binder_trace.h

+8 −6
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ TRACE_EVENT(binder_transaction_node_to_ref, 
	TP_STRUCT__entry(

		__field(int, debug_id)

		__field(int, node_debug_id)

		__field(void __user *, node_ptr)

		__field(binder_uintptr_t, node_ptr)

		__field(int, ref_debug_id)

		__field(uint32_t, ref_desc)

	),
@@ -163,8 +163,9 @@ 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%p ==> dest_ref=%d dest_desc=%d",

		  __entry->debug_id, __entry->node_debug_id, __entry->node_ptr,

	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,

		  __entry->ref_debug_id, __entry->ref_desc)

);
@@ -177,7 +178,7 @@ TRACE_EVENT(binder_transaction_ref_to_node, 
		__field(int, ref_debug_id)

		__field(uint32_t, ref_desc)

		__field(int, node_debug_id)

		__field(void __user *, node_ptr)

		__field(binder_uintptr_t, node_ptr)

	),

	TP_fast_assign(

		__entry->debug_id = t->debug_id;
@@ -186,9 +187,10 @@ 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%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,

drivers/staging/android/uapi/binder.h

+36 −24

File changed.

Preview size limit exceeded, changes collapsed.