Merge "staging: android: binder: fix ABI for 64bit Android" (d2986f25) · Commits · e / devices / android_kernel_sony_msm8994

drivers/staging/android/uapi/binder.h

+9 −4

Original line number	Diff line number	Diff line
		@@ -152,6 +152,11 @@ struct binder_ptr_cookie {
		void *cookie;
		};

		struct binder_handle_cookie {
		__u32 handle;
		void *cookie;
		} __attribute__((packed));

		struct binder_pri_desc {
		__s32 priority;
		__u32 desc;
		@@ -308,15 +313,15 @@ enum binder_driver_command_protocol {
		* of looping threads it has available.
		*/

		BC_REQUEST_DEATH_NOTIFICATION = _IOW('c', 14, struct binder_ptr_cookie),
		BC_REQUEST_DEATH_NOTIFICATION = _IOW('c', 14, struct binder_handle_cookie),
		/*
		* void *: ptr to binder
		* int: handle
		* void *: cookie
		*/

		BC_CLEAR_DEATH_NOTIFICATION = _IOW('c', 15, struct binder_ptr_cookie),
		BC_CLEAR_DEATH_NOTIFICATION = _IOW('c', 15, struct binder_handle_cookie),
		/*
		* void *: ptr to binder
		* int: handle
		* void *: cookie
		*/