2 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index a8cc4e13434c..c90696544176 100644
--- a/include/linux/thread_info.h
+++ b/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/kernel/futex.c b/kernel/futex.c
index 464de2751ff9..45e448a5e440 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1843,7 +1843,7 @@ retry:
 
         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 @@ out:
 
 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;