itimers: Prepare for PREEMPT_RT

[linux-2.6-microblaze.git] / kernel / time / itimer.c

diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
index 02068b2..9d26fd4 100644 (file)
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
@@ -213,6 +213,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);