1 files changed, 4 insertions, 8 deletions

diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index 02068b2d5862..77f1e5635cc1 100644
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -55,15 +55,10 @@ static void get_cpu_itimer(struct task_struct *tsk, unsigned int clock_id,
         val = it->expires;
         interval = it->incr;
         if (val) {
-                struct task_cputime cputime;
-                u64 t;
+                u64 t, samples[CPUCLOCK_MAX];
 
-                thread_group_cputimer(tsk, &cputime);
-                if (clock_id == CPUCLOCK_PROF)
-                        t = cputime.utime + cputime.stime;
-                else
-                        /* CPUCLOCK_VIRT */
-                        t = cputime.utime;
+                thread_group_sample_cputime(tsk, samples);
+                t = samples[clock_id];
 
                 if (val < t)
                         /* about to fire */
@@ -213,6 +208,7 @@ again:
                 /* We are sharing ->siglock with it_real_fn() */
                 if (hrtimer_try_to_cancel(timer) < 0) {
                         spin_unlock_irq(&tsk->sighand->siglock);
+                        hrtimer_cancel_wait_running(timer);
                         goto again;
                 }
                 expires = timeval_to_ktime(value->it_value);