---

yaml --- r: 304421 b: refs/heads/master c: 78aee0f h: refs/heads/master i: 304419: 7cf6afb v: v3
git-mirror · Apr 24, 2012 · ff8a5b3 · ff8a5b3
1 parent 12a057f
commit ff8a5b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a180c0d659f604568637336a00c0c3ca2f7b094a
+refs/heads/master: 78aee0fc9a2ee913ef8c524c380a72ee693dd6cb
diff --git a/trunk/drivers/staging/android/binder.h b/trunk/drivers/staging/android/binder.h
@@ -53,12 +53,12 @@ struct flat_binder_object {
 
 	/* 8 bytes of data. */
 	union {
-		void		*binder;	/* local object */
+		void __user	*binder;	/* local object */
 		signed long	handle;		/* remote object */
 	};
 
 	/* extra data associated with local object */
-	void			*cookie;
+	void __user		*cookie;
 };
 
 /*
@@ -139,9 +139,9 @@ struct binder_transaction_data {
 	union {
 		struct {
 			/* transaction data */
-			const void	*buffer;
+			const void __user	*buffer;
 			/* offsets from buffer to flat_binder_object structs */
-			const void	*offsets;
+			const void __user	*offsets;
 		} ptr;
 		uint8_t	buf[8];
 	} data;