diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-03 13:29:34 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:38:08 (GMT) |
| commit | a81e62ef0b3852e26665d916d60c7452d80ca10a (patch) | |
| tree | 645d6acccd9bccdfadd819d9ae7f427079ae7554 /include/linux | |
| parent | c39360ac3b59843d79d4a76a317b9581c6895757 (diff) | |
| download | linux-fsl-qoriq-a81e62ef0b3852e26665d916d60c7452d80ca10a.tar.xz | |
timers: prepare for full preemption
When softirqs can be preempted we need to make sure that cancelling
the timer from the active thread can not deadlock vs. a running timer
callback. Add a waitqueue to resolve that.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index 8c5a197..5fcd72c 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -241,7 +241,7 @@ extern void add_timer(struct timer_list *timer); extern int try_to_del_timer_sync(struct timer_list *timer); -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL) extern int del_timer_sync(struct timer_list *timer); #else # define del_timer_sync(t) del_timer(t) |