1 files changed, 3 insertions, 6 deletions

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index a8cc4e13434c..8d03f079688c 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -18,21 +18,18 @@ struct compat_timespec;
 struct restart_block {
         long (*fn)(struct restart_block *);
         union {
-                struct {
-                        unsigned long arg0, arg1, arg2, arg3;
-                };
                 /* 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 {
-                        clockid_t index;
+                        clockid_t clockid;
                         struct timespec __user *rmtp;
 #ifdef CONFIG_COMPAT
                         struct compat_timespec __user *compat_rmtp;