Merge ath-next from ath.git

[deliverable/linux.git] / kernel / compat.c

diff --git a/kernel/compat.c b/kernel/compat.c
index ebb3c369d03d594067bda50bdffedd32159026e3..24f00610c575fd5d34c40dcf9fad35b358596c22 100644 (file)
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -276,8 +276,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
         * core implementation decides to return random nonsense.
         */
        if (ret == -ERESTART_RESTARTBLOCK) {
-               struct restart_block *restart
-                       = &current_thread_info()->restart_block;
+               struct restart_block *restart = &current->restart_block;
 
                restart->fn = compat_nanosleep_restart;
                restart->nanosleep.compat_rmtp = rmtp;
@@ -860,7 +859,7 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
                return -EFAULT;
 
        if (err == -ERESTART_RESTARTBLOCK) {
-               restart = &current_thread_info()->restart_block;
+               restart = &current->restart_block;
                restart->fn = compat_clock_nanosleep_restart;
                restart->nanosleep.compat_rmtp = rmtp;
        }