---

yaml --- r: 212127 b: refs/heads/master c: a3c74c5 h: refs/heads/master i: 212125: c8d095c 212123: 4c64470 212119: 88fcee8 212111: 6a366e4 212095: 2f8535c v: v3
git-mirror · Sep 18, 2010 · 97853a8 · 97853a8
1 parent ab8b60f
commit 97853a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dcc41bb037533839753df983d31778b30b67d93
+refs/heads/master: a3c74c52570c0c4ac90c9a0216de800c39089ba7
diff --git a/trunk/include/linux/thread_info.h b/trunk/include/linux/thread_info.h
@@ -23,12 +23,12 @@ struct restart_block {
 		};
 		/* For futex_wait and futex_wait_requeue_pi */
 		struct {
-			u32 *uaddr;
+			u32 __user *uaddr;
 			u32 val;
 			u32 flags;
 			u32 bitset;
 			u64 time;
-			u32 *uaddr2;
+			u32 __user *uaddr2;
 		} futex;
 		/* For nanosleep */
 		struct {

diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
@@ -1843,7 +1843,7 @@ static int futex_wait(u32 __user *uaddr, int fshared,
 
 	restart = &current_thread_info()->restart_block;
 	restart->fn = futex_wait_restart;
-	restart->futex.uaddr = (u32 *)uaddr;
+	restart->futex.uaddr = uaddr;
 	restart->futex.val = val;
 	restart->futex.time = abs_time->tv64;
 	restart->futex.bitset = bitset;
@@ -1869,7 +1869,7 @@ static int futex_wait(u32 __user *uaddr, int fshared,
 
 static long futex_wait_restart(struct restart_block *restart)
 {
-	u32 __user *uaddr = (u32 __user *)restart->futex.uaddr;
+	u32 __user *uaddr = restart->futex.uaddr;
 	int fshared = 0;
 	ktime_t t, *tp = NULL;