diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-03 08:29:34 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2011-12-28 16:25:34 -0600 |
| commit | e89767ee5b6452372411df0699a9c345474c6192 (patch) | |
| tree | ab4b55fa4a5030148e7f99c0a12bfde9b73d2cf6 /include/linux/timer.h | |
| parent | 4dc1063e64ee5135ca3592f5c86c7ad1f59eca83 (diff) | |
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/timer.h')
| -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 6abd9138beda..b703477bd2d6 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -276,7 +276,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) |