1 files changed, 33 insertions, 7 deletions

diff --git a/kernel/compat.c b/kernel/compat.c
index 2f672332430f..75573e5d27b0 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -22,6 +22,7 @@
 #include <linux/security.h>
 #include <linux/timex.h>
 #include <linux/migrate.h>
+#include <linux/posix-timers.h>
 
 #include <asm/uaccess.h>
 
@@ -601,6 +602,30 @@ long compat_sys_clock_getres(clockid_t which_clock,
         return err;
 } 
 
+static long compat_clock_nanosleep_restart(struct restart_block *restart)
+{
+        long err;
+        mm_segment_t oldfs;
+        struct timespec tu;
+        struct compat_timespec *rmtp = (struct compat_timespec *)(restart->arg1);
+
+        restart->arg1 = (unsigned long) &tu;
+        oldfs = get_fs();
+        set_fs(KERNEL_DS);
+        err = clock_nanosleep_restart(restart);
+        set_fs(oldfs);
+
+        if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
+            put_compat_timespec(&tu, rmtp))
+                return -EFAULT;
+
+        if (err == -ERESTART_RESTARTBLOCK) {
+                restart->fn = compat_clock_nanosleep_restart;
+                restart->arg1 = (unsigned long) rmtp;
+        }
+        return err;
+}
+
 long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
                             struct compat_timespec __user *rqtp,
                             struct compat_timespec __user *rmtp)
@@ -608,6 +633,7 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
         long err;
         mm_segment_t oldfs;
         struct timespec in, out; 
+        struct restart_block *restart;
 
         if (get_compat_timespec(&in, rqtp)) 
                 return -EFAULT;
@@ -618,9 +644,16 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
                                   (struct timespec __user *) &in,
                                   (struct timespec __user *) &out);
         set_fs(oldfs);
+
         if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
             put_compat_timespec(&out, rmtp))
                 return -EFAULT;
+
+        if (err == -ERESTART_RESTARTBLOCK) {
+                restart = &current_thread_info()->restart_block;
+                restart->fn = compat_clock_nanosleep_restart;
+                restart->arg1 = (unsigned long) rmtp;
+        }
         return err;     
 } 
 
@@ -730,17 +763,10 @@ void
 sigset_from_compat (sigset_t *set, compat_sigset_t *compat)
 {
         switch (_NSIG_WORDS) {
-#if defined (__COMPAT_ENDIAN_SWAP__)
-        case 4: set->sig[3] = compat->sig[7] | (((long)compat->sig[6]) << 32 );
-        case 3: set->sig[2] = compat->sig[5] | (((long)compat->sig[4]) << 32 );
-        case 2: set->sig[1] = compat->sig[3] | (((long)compat->sig[2]) << 32 );
-        case 1: set->sig[0] = compat->sig[1] | (((long)compat->sig[0]) << 32 );
-#else
         case 4: set->sig[3] = compat->sig[6] | (((long)compat->sig[7]) << 32 );
         case 3: set->sig[2] = compat->sig[4] | (((long)compat->sig[5]) << 32 );
         case 2: set->sig[1] = compat->sig[2] | (((long)compat->sig[3]) << 32 );
         case 1: set->sig[0] = compat->sig[0] | (((long)compat->sig[1]) << 32 );
-#endif
         }
 }