[PATCH] hrtimer: switch clock_nanosleep to hrtimer nanosleep API

Switch clock_nanosleep to use the new nanosleep functions in hrtimer.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 14 insertions, 9 deletions

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index abf6990c6eb5..520f6c59948d 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -1400,7 +1400,7 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clock_idx,
 static long posix_cpu_clock_nanosleep_restart(struct restart_block *);
 
 int posix_cpu_nsleep(const clockid_t which_clock, int flags,
-                     struct timespec *rqtp)
+                     struct timespec *rqtp, struct timespec __user *rmtp)
 {
         struct restart_block *restart_block =
             &current_thread_info()->restart_block;
@@ -1425,7 +1425,6 @@ int posix_cpu_nsleep(const clockid_t which_clock, int flags,
         error = posix_cpu_timer_create(&timer);
         timer.it_process = current;
         if (!error) {
-                struct timespec __user *rmtp;
                 static struct itimerspec zero_it;
                 struct itimerspec it = { .it_value = *rqtp,
                                          .it_interval = {} };
@@ -1472,7 +1471,6 @@ int posix_cpu_nsleep(const clockid_t which_clock, int flags,
                 /*
                  * Report back to the user the time still remaining.
                  */
-                rmtp = (struct timespec __user *) restart_block->arg1;
                 if (rmtp != NULL && !(flags & TIMER_ABSTIME) &&
                     copy_to_user(rmtp, &it.it_value, sizeof *rmtp))
                         return -EFAULT;
@@ -1480,6 +1478,7 @@ int posix_cpu_nsleep(const clockid_t which_clock, int flags,
                 restart_block->fn = posix_cpu_clock_nanosleep_restart;
                 /* Caller already set restart_block->arg1 */
                 restart_block->arg0 = which_clock;
+                restart_block->arg1 = (unsigned long) rmtp;
                 restart_block->arg2 = rqtp->tv_sec;
                 restart_block->arg3 = rqtp->tv_nsec;
 
@@ -1493,10 +1492,15 @@ static long
 posix_cpu_clock_nanosleep_restart(struct restart_block *restart_block)
 {
         clockid_t which_clock = restart_block->arg0;
-        struct timespec t = { .tv_sec = restart_block->arg2,
-                              .tv_nsec = restart_block->arg3 };
+        struct timespec __user *rmtp;
+        struct timespec t;
+
+        rmtp = (struct timespec __user *) restart_block->arg1;
+        t.tv_sec = restart_block->arg2;
+        t.tv_nsec = restart_block->arg3;
+
         restart_block->fn = do_no_restart_syscall;
-        return posix_cpu_nsleep(which_clock, TIMER_ABSTIME, &t);
+        return posix_cpu_nsleep(which_clock, TIMER_ABSTIME, &t, rmtp);
 }
 
 
@@ -1519,9 +1523,10 @@ static int process_cpu_timer_create(struct k_itimer *timer)
         return posix_cpu_timer_create(timer);
 }
 static int process_cpu_nsleep(const clockid_t which_clock, int flags,
-                              struct timespec *rqtp)
+                              struct timespec *rqtp,
+                              struct timespec __user *rmtp)
 {
-        return posix_cpu_nsleep(PROCESS_CLOCK, flags, rqtp);
+        return posix_cpu_nsleep(PROCESS_CLOCK, flags, rqtp, rmtp);
 }
 static int thread_cpu_clock_getres(const clockid_t which_clock,
                                    struct timespec *tp)
@@ -1539,7 +1544,7 @@ static int thread_cpu_timer_create(struct k_itimer *timer)
         return posix_cpu_timer_create(timer);
 }
 static int thread_cpu_nsleep(const clockid_t which_clock, int flags,
-                              struct timespec *rqtp)
+                              struct timespec *rqtp, struct timespec __user *rmtp)
 {
         return -EINVAL;
 }