2 files changed, 28 insertions, 14 deletions

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index 1c4eb41dbd89..9c4ad755d7e5 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -7,12 +7,25 @@
 #ifndef _LINUX_THREAD_INFO_H
 #define _LINUX_THREAD_INFO_H
 
+#include <linux/types.h>
+
 /*
- * System call restart block. 
+ * System call restart block.
  */
 struct restart_block {
         long (*fn)(struct restart_block *);
-        unsigned long arg0, arg1, arg2, arg3;
+        union {
+                struct {
+                        unsigned long arg0, arg1, arg2, arg3;
+                };
+                /* For futex_wait */
+                struct {
+                        u32 *uaddr;
+                        u32 val;
+                        u32 flags;
+                        u64 time;
+                } futex;
+        };
 };
 
 extern long do_no_restart_syscall(struct restart_block *parm);
diff --git a/kernel/futex.c b/kernel/futex.c
index 9dc591ab681a..e8fbdd7d95ac 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1149,9 +1149,9 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
 
 /*
  * In case we must use restart_block to restart a futex_wait,
- * we encode in the 'arg3' shared capability
+ * we encode in the 'flags' shared capability
  */
-#define ARG3_SHARED  1
+#define FLAGS_SHARED  1
 
 static long futex_wait_restart(struct restart_block *restart);
 
@@ -1290,12 +1290,13 @@ static int futex_wait(u32 __user *uaddr, struct rw_semaphore *fshared,
                 struct restart_block *restart;
                 restart = &current_thread_info()->restart_block;
                 restart->fn = futex_wait_restart;
-                restart->arg0 = (unsigned long)uaddr;
-                restart->arg1 = (unsigned long)val;
-                restart->arg2 = (unsigned long)abs_time;
-                restart->arg3 = 0;
+                restart->futex.uaddr = (u32 *)uaddr;
+                restart->futex.val = val;
+                restart->futex.time = abs_time->tv64;
+                restart->futex.flags = 0;
+
                 if (fshared)
-                        restart->arg3 |= ARG3_SHARED;
+                        restart->futex.flags |= FLAGS_SHARED;
                 return -ERESTART_RESTARTBLOCK;
         }
 
@@ -1310,15 +1311,15 @@ static int futex_wait(u32 __user *uaddr, struct rw_semaphore *fshared,
 
 static long futex_wait_restart(struct restart_block *restart)
 {
-        u32 __user *uaddr = (u32 __user *)restart->arg0;
-        u32 val = (u32)restart->arg1;
-        ktime_t *abs_time = (ktime_t *)restart->arg2;
+        u32 __user *uaddr = (u32 __user *)restart->futex.uaddr;
         struct rw_semaphore *fshared = NULL;
+        ktime_t t;
 
+        t.tv64 = restart->futex.time;
         restart->fn = do_no_restart_syscall;
-        if (restart->arg3 & ARG3_SHARED)
+        if (restart->futex.flags & FLAGS_SHARED)
                 fshared = &current->mm->mmap_sem;
-        return (long)futex_wait(uaddr, fshared, val, abs_time);
+        return (long)futex_wait(uaddr, fshared, restart->futex.val, &t);
 }