1 files changed, 8 insertions, 10 deletions

diff --git a/kernel/itimer.c b/kernel/itimer.c
index 204ed7939e75..307c6a632ef6 100644
--- a/kernel/itimer.c
+++ b/kernel/itimer.c
@@ -128,18 +128,13 @@ asmlinkage long sys_getitimer(int which, struct itimerval __user *value)
 /*
  * The timer is automagically restarted, when interval != 0
  */
-int it_real_fn(struct hrtimer *timer)
+enum hrtimer_restart it_real_fn(struct hrtimer *timer)
 {
         struct signal_struct *sig =
             container_of(timer, struct signal_struct, real_timer);
 
         send_group_sig_info(SIGALRM, SEND_SIG_PRIV, sig->tsk);
 
-        if (sig->it_real_incr.tv64 != 0) {
-                hrtimer_forward(timer, timer->base->softirq_time,
-                                sig->it_real_incr);
-                return HRTIMER_RESTART;
-        }
         return HRTIMER_NORESTART;
 }
 
@@ -231,11 +226,14 @@ again:
                         spin_unlock_irq(&tsk->sighand->siglock);
                         goto again;
                 }
-                tsk->signal->it_real_incr =
-                        timeval_to_ktime(value->it_interval);
                 expires = timeval_to_ktime(value->it_value);
-                if (expires.tv64 != 0)
-                        hrtimer_start(timer, expires, HRTIMER_REL);
+                if (expires.tv64 != 0) {
+                        tsk->signal->it_real_incr =
+                                timeval_to_ktime(value->it_interval);
+                        hrtimer_start(timer, expires, HRTIMER_MODE_REL);
+                } else
+                        tsk->signal->it_real_incr.tv64 = 0;
+
                 spin_unlock_irq(&tsk->sighand->siglock);
                 break;
         case ITIMER_VIRTUAL: