1 files changed, 37 insertions, 39 deletions

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index cae4f5728997..520f6c59948d 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -7,7 +7,7 @@
 #include <asm/uaccess.h>
 #include <linux/errno.h>
 
-static int check_clock(clockid_t which_clock)
+static int check_clock(const clockid_t which_clock)
 {
         int error = 0;
         struct task_struct *p;
@@ -31,7 +31,7 @@ static int check_clock(clockid_t which_clock)
 }
 
 static inline union cpu_time_count
-timespec_to_sample(clockid_t which_clock, const struct timespec *tp)
+timespec_to_sample(const clockid_t which_clock, const struct timespec *tp)
 {
         union cpu_time_count ret;
         ret.sched = 0;          /* high half always zero when .cpu used */
@@ -43,7 +43,7 @@ timespec_to_sample(clockid_t which_clock, const struct timespec *tp)
         return ret;
 }
 
-static void sample_to_timespec(clockid_t which_clock,
+static void sample_to_timespec(const clockid_t which_clock,
                                union cpu_time_count cpu,
                                struct timespec *tp)
 {
@@ -55,7 +55,7 @@ static void sample_to_timespec(clockid_t which_clock,
         }
 }
 
-static inline int cpu_time_before(clockid_t which_clock,
+static inline int cpu_time_before(const clockid_t which_clock,
                                   union cpu_time_count now,
                                   union cpu_time_count then)
 {
@@ -65,7 +65,7 @@ static inline int cpu_time_before(clockid_t which_clock,
                 return cputime_lt(now.cpu, then.cpu);
         }
 }
-static inline void cpu_time_add(clockid_t which_clock,
+static inline void cpu_time_add(const clockid_t which_clock,
                                 union cpu_time_count *acc,
                                 union cpu_time_count val)
 {
@@ -75,7 +75,7 @@ static inline void cpu_time_add(clockid_t which_clock,
                 acc->cpu = cputime_add(acc->cpu, val.cpu);
         }
 }
-static inline union cpu_time_count cpu_time_sub(clockid_t which_clock,
+static inline union cpu_time_count cpu_time_sub(const clockid_t which_clock,
                                                 union cpu_time_count a,
                                                 union cpu_time_count b)
 {
@@ -151,7 +151,7 @@ static inline unsigned long long sched_ns(struct task_struct *p)
         return (p == current) ? current_sched_time(p) : p->sched_time;
 }
 
-int posix_cpu_clock_getres(clockid_t which_clock, struct timespec *tp)
+int posix_cpu_clock_getres(const clockid_t which_clock, struct timespec *tp)
 {
         int error = check_clock(which_clock);
         if (!error) {
@@ -169,7 +169,7 @@ int posix_cpu_clock_getres(clockid_t which_clock, struct timespec *tp)
         return error;
 }
 
-int posix_cpu_clock_set(clockid_t which_clock, const struct timespec *tp)
+int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *tp)
 {
         /*
          * You can never reset a CPU clock, but we check for other errors
@@ -186,7 +186,7 @@ int posix_cpu_clock_set(clockid_t which_clock, const struct timespec *tp)
 /*
  * Sample a per-thread clock for the given task.
  */
-static int cpu_clock_sample(clockid_t which_clock, struct task_struct *p,
+static int cpu_clock_sample(const clockid_t which_clock, struct task_struct *p,
                             union cpu_time_count *cpu)
 {
         switch (CPUCLOCK_WHICH(which_clock)) {
@@ -238,18 +238,7 @@ static int cpu_clock_sample_group_locked(unsigned int clock_idx,
                 while ((t = next_thread(t)) != p) {
                         cpu->sched += t->sched_time;
                 }
-                if (p->tgid == current->tgid) {
-                        /*
-                         * We're sampling ourselves, so include the
-                         * cycles not yet banked.  We still omit
-                         * other threads running on other CPUs,
-                         * so the total can always be behind as
-                         * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ).
-                         */
-                        cpu->sched += current_sched_time(current);
-                } else {
-                        cpu->sched += p->sched_time;
-                }
+                cpu->sched += sched_ns(p);
                 break;
         }
         return 0;
@@ -259,7 +248,7 @@ static int cpu_clock_sample_group_locked(unsigned int clock_idx,
  * Sample a process (thread group) clock for the given group_leader task.
  * Must be called with tasklist_lock held for reading.
  */
-static int cpu_clock_sample_group(clockid_t which_clock,
+static int cpu_clock_sample_group(const clockid_t which_clock,
                                   struct task_struct *p,
                                   union cpu_time_count *cpu)
 {
@@ -273,7 +262,7 @@ static int cpu_clock_sample_group(clockid_t which_clock,
 }
 
 
-int posix_cpu_clock_get(clockid_t which_clock, struct timespec *tp)
+int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *tp)
 {
         const pid_t pid = CPUCLOCK_PID(which_clock);
         int error = -EINVAL;
@@ -1410,8 +1399,8 @@ 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(clockid_t which_clock, int flags,
-                     struct timespec *rqtp)
+int posix_cpu_nsleep(const clockid_t which_clock, int flags,
+                     struct timespec *rqtp, struct timespec __user *rmtp)
 {
         struct restart_block *restart_block =
             &current_thread_info()->restart_block;
@@ -1436,7 +1425,6 @@ int posix_cpu_nsleep(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 = {} };
@@ -1483,7 +1471,6 @@ int posix_cpu_nsleep(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;
@@ -1491,6 +1478,7 @@ int posix_cpu_nsleep(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;
 
@@ -1504,21 +1492,28 @@ 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);
 }
 
 
 #define PROCESS_CLOCK   MAKE_PROCESS_CPUCLOCK(0, CPUCLOCK_SCHED)
 #define THREAD_CLOCK    MAKE_THREAD_CPUCLOCK(0, CPUCLOCK_SCHED)
 
-static int process_cpu_clock_getres(clockid_t which_clock, struct timespec *tp)
+static int process_cpu_clock_getres(const clockid_t which_clock,
+                                    struct timespec *tp)
 {
         return posix_cpu_clock_getres(PROCESS_CLOCK, tp);
 }
-static int process_cpu_clock_get(clockid_t which_clock, struct timespec *tp)
+static int process_cpu_clock_get(const clockid_t which_clock,
+                                 struct timespec *tp)
 {
         return posix_cpu_clock_get(PROCESS_CLOCK, tp);
 }
@@ -1527,16 +1522,19 @@ static int process_cpu_timer_create(struct k_itimer *timer)
         timer->it_clock = PROCESS_CLOCK;
         return posix_cpu_timer_create(timer);
 }
-static int process_cpu_nsleep(clockid_t which_clock, int flags,
-                              struct timespec *rqtp)
+static int process_cpu_nsleep(const clockid_t which_clock, int flags,
+                              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(clockid_t which_clock, struct timespec *tp)
+static int thread_cpu_clock_getres(const clockid_t which_clock,
+                                   struct timespec *tp)
 {
         return posix_cpu_clock_getres(THREAD_CLOCK, tp);
 }
-static int thread_cpu_clock_get(clockid_t which_clock, struct timespec *tp)
+static int thread_cpu_clock_get(const clockid_t which_clock,
+                                struct timespec *tp)
 {
         return posix_cpu_clock_get(THREAD_CLOCK, tp);
 }
@@ -1545,8 +1543,8 @@ static int thread_cpu_timer_create(struct k_itimer *timer)
         timer->it_clock = THREAD_CLOCK;
         return posix_cpu_timer_create(timer);
 }
-static int thread_cpu_nsleep(clockid_t which_clock, int flags,
-                              struct timespec *rqtp)
+static int thread_cpu_nsleep(const clockid_t which_clock, int flags,
+                              struct timespec *rqtp, struct timespec __user *rmtp)
 {
         return -EINVAL;
 }