Commit a16a1c09 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds

[PATCH] hrtimers: fix oldvalue return in setitimer

This resolves bugzilla bug#5617.  The oldvalue of the timer was read after the
timer was cancelled, so the remaining time was always zero.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b6557fbc
...@@ -155,16 +155,16 @@ int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue) ...@@ -155,16 +155,16 @@ int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue)
again: again:
spin_lock_irq(&tsk->sighand->siglock); spin_lock_irq(&tsk->sighand->siglock);
timer = &tsk->signal->real_timer; timer = &tsk->signal->real_timer;
/* We are sharing ->siglock with it_real_fn() */
if (hrtimer_try_to_cancel(timer) < 0) {
spin_unlock_irq(&tsk->sighand->siglock);
goto again;
}
if (ovalue) { if (ovalue) {
ovalue->it_value = itimer_get_remtime(timer); ovalue->it_value = itimer_get_remtime(timer);
ovalue->it_interval ovalue->it_interval
= ktime_to_timeval(tsk->signal->it_real_incr); = ktime_to_timeval(tsk->signal->it_real_incr);
} }
/* We are sharing ->siglock with it_real_fn() */
if (hrtimer_try_to_cancel(timer) < 0) {
spin_unlock_irq(&tsk->sighand->siglock);
goto again;
}
tsk->signal->it_real_incr = tsk->signal->it_real_incr =
timeval_to_ktime(value->it_interval); timeval_to_ktime(value->it_interval);
expires = timeval_to_ktime(value->it_value); expires = timeval_to_ktime(value->it_value);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment