mac80211: fix deauth before assoc

[safe/jmp/linux-2.6] / kernel / itimer.c

diff --git a/kernel/itimer.c b/kernel/itimer.c
index 852c88d..d802883 100644 (file)
--- a/kernel/itimer.c
+++ b/kernel/itimer.c
@@ -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];
@@ -64,7 +65,7 @@ static void get_cpu_itimer(struct task_struct *tsk, unsigned int clock_id,
 
                if (cputime_le(cval, t))
                        /* about to fire */
-                       cval = jiffies_to_cputime(1);
+                       cval = cputime_one_jiffy;
                else
                        cval = cputime_sub(cval, t);
        }
@@ -122,19 +123,39 @@ 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);
 
@@ -143,11 +164,15 @@ static void set_cpu_itimer(struct task_struct *tsk, unsigned int clock_id,
        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));
+                       nval = cputime_add(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 +224,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: