From 97853a83732285def4f4dc1d707a8ff5ae928c10 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Tue, 14 Sep 2010 21:43:47 +0900
Subject: [PATCH] --- yaml --- r: 212127 b: refs/heads/master c:
 a3c74c52570c0c4ac90c9a0216de800c39089ba7 h: refs/heads/master i:   212125:
 c8d095cac8fc4de45d95fe67a2fd006d4fe3a249   212123:
 4c64470d017842c2d3d1a7ff4ff69726bc8d2cbe   212119:
 88fcee8ca109facb7baf8ec32ddb84617fd2d8d4   212111:
 6a366e42a08aeaee735dabdfd69c3f3257ed74a5   212095:
 2f8535c2e1b125f3f1fe12c3cb0a9ec9181a84c8 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/thread_info.h | 4 ++--
 trunk/kernel/futex.c              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index a848b5870971..a3e4dbf7def8 100644
--- 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
index a8cc4e13434c..c90696544176 100644
--- 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
index 464de2751ff9..45e448a5e440 100644
--- 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;