ARM: 7616/1: cache-l2x0: aurora: Use writel_relaxed instead of writel
[linux-3.10.git] / kernel / itimer.c
index 852c88d..8d262b4 100644 (file)
@@ -12,6 +12,7 @@
 #include <linux/time.h>
 #include <linux/posix-timers.h>
 #include <linux/hrtimer.h>
+#include <trace/events/timer.h>
 
 #include <asm/uaccess.h>
 
@@ -42,7 +43,7 @@ static struct timeval itimer_get_remtime(struct hrtimer *timer)
 }
 
 static void get_cpu_itimer(struct task_struct *tsk, unsigned int clock_id,
-                          struct itimerval *value)
+                          struct itimerval *const value)
 {
        cputime_t cval, cinterval;
        struct cpu_itimer *it = &tsk->signal->it[clock_id];
@@ -51,22 +52,22 @@ static void get_cpu_itimer(struct task_struct *tsk, unsigned int clock_id,
 
        cval = it->expires;
        cinterval = it->incr;
-       if (!cputime_eq(cval, cputime_zero)) {
+       if (cval) {
                struct task_cputime cputime;
                cputime_t t;
 
                thread_group_cputimer(tsk, &cputime);
                if (clock_id == CPUCLOCK_PROF)
-                       t = cputime_add(cputime.utime, cputime.stime);
+                       t = cputime.utime + cputime.stime;
                else
                        /* CPUCLOCK_VIRT */
                        t = cputime.utime;
 
-               if (cputime_le(cval, t))
+               if (cval < t)
                        /* about to fire */
-                       cval = jiffies_to_cputime(1);
+                       cval = cputime_one_jiffy;
                else
-                       cval = cputime_sub(cval, t);
+                       cval = cval - t;
        }
 
        spin_unlock_irq(&tsk->sighand->siglock);
@@ -122,32 +123,55 @@ enum hrtimer_restart it_real_fn(struct hrtimer *timer)
        struct signal_struct *sig =
                container_of(timer, struct signal_struct, real_timer);
 
+       trace_itimer_expire(ITIMER_REAL, sig->leader_pid, 0);
        kill_pid_info(SIGALRM, SEND_SIG_PRIV, sig->leader_pid);
 
        return HRTIMER_NORESTART;
 }
 
+static inline u32 cputime_sub_ns(cputime_t ct, s64 real_ns)
+{
+       struct timespec ts;
+       s64 cpu_ns;
+
+       cputime_to_timespec(ct, &ts);
+       cpu_ns = timespec_to_ns(&ts);
+
+       return (cpu_ns <= real_ns) ? 0 : cpu_ns - real_ns;
+}
+
 static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id,
-                          struct itimerval *value, struct itimerval *ovalue)
+                          const struct itimerval *const value,
+                          struct itimerval *const ovalue)
 {
-       cputime_t cval, cinterval, nval, ninterval;
+       cputime_t cval, nval, cinterval, ninterval;
+       s64 ns_ninterval, ns_nval;
+       u32 error, incr_error;
        struct cpu_itimer *it = &tsk->signal->it[clock_id];
 
        nval = timeval_to_cputime(&value->it_value);
+       ns_nval = timeval_to_ns(&value->it_value);
        ninterval = timeval_to_cputime(&value->it_interval);
+       ns_ninterval = timeval_to_ns(&value->it_interval);
+
+       error = cputime_sub_ns(nval, ns_nval);
+       incr_error = cputime_sub_ns(ninterval, ns_ninterval);
 
        spin_lock_irq(&tsk->sighand->siglock);
 
        cval = it->expires;
        cinterval = it->incr;
-       if (!cputime_eq(cval, cputime_zero) ||
-           !cputime_eq(nval, cputime_zero)) {
-               if (cputime_gt(nval, cputime_zero))
-                       nval = cputime_add(nval, jiffies_to_cputime(1));
+       if (cval || nval) {
+               if (nval > 0)
+                       nval += cputime_one_jiffy;
                set_process_cpu_timer(tsk, clock_id, &nval, &cval);
        }
        it->expires = nval;
        it->incr = ninterval;
+       it->error = error;
+       it->incr_error = incr_error;
+       trace_itimer_state(clock_id == CPUCLOCK_VIRT ?
+                          ITIMER_VIRTUAL : ITIMER_PROF, value, nval);
 
        spin_unlock_irq(&tsk->sighand->siglock);
 
@@ -199,6 +223,7 @@ again:
                } else
                        tsk->signal->it_real_incr.tv64 = 0;
 
+               trace_itimer_state(ITIMER_REAL, value, 0);
                spin_unlock_irq(&tsk->sighand->siglock);
                break;
        case ITIMER_VIRTUAL:
@@ -259,8 +284,12 @@ SYSCALL_DEFINE3(setitimer, int, which, struct itimerval __user *, value,
        if (value) {
                if(copy_from_user(&set_buffer, value, sizeof(set_buffer)))
                        return -EFAULT;
-       } else
-               memset((char *) &set_buffer, 0, sizeof(set_buffer));
+       } else {
+               memset(&set_buffer, 0, sizeof(set_buffer));
+               printk_once(KERN_WARNING "%s calls setitimer() with new_value NULL pointer."
+                           " Misfeature support will be removed\n",
+                           current->comm);
+       }
 
        error = do_setitimer(which, &set_buffer, ovalue ? &get_buffer : NULL);
        if (error || !ovalue)