diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-03 13:29:34 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:19:07 (GMT) |
| commit | 00417c7d809cc169dabef50a51ea4912ac74c9d1 (patch) | |
| tree | cdb0c8dde7a601cac9acbbdb42feb66eccd6b78d /kernel/itimer.c | |
| parent | 3a522ffe61ee80adcc78f2fd25bae737a04b9b4c (diff) | |
| download | linux-fsl-qoriq-00417c7d809cc169dabef50a51ea4912ac74c9d1.tar.xz | |
hrtimers: prepare full preemption
Make cancellation of a running callback in softirq context safe
against preemption.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/itimer.c')
| -rw-r--r-- | kernel/itimer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/itimer.c b/kernel/itimer.c index 8d262b4..d051390 100644 --- a/kernel/itimer.c +++ b/kernel/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_wait_for_timer(&tsk->signal->real_timer); goto again; } expires = timeval_to_ktime(value->it_value); |