diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-07-03 13:29:34 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:28 (GMT) |
commit | 6358d9720b078d7da8c6c78c8f0ea4ae3f98ac54 (patch) | |
tree | 4154b677a7f63718366ce200cc0175ddc9a59a0f /include | |
parent | 1f38946e9cc02ef088547f90e080d284e2c98453 (diff) | |
download | linux-fsl-qoriq-6358d9720b078d7da8c6c78c8f0ea4ae3f98ac54.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')
-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) |