summaryrefslogtreecommitdiff
path: root/include/linux/timer.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-07-03 08:29:34 -0500
committerClark Williams <williams@redhat.com>2012-04-04 09:14:32 -0500
commitafb263bd55a40a6fa1d9b7a3ff974ad366e107b4 (patch)
tree133bf70b042d9447e4de2635ffc858054a18a109 /include/linux/timer.h
parent6dd757c388eab9afdcaa4b730a1a029915babe4e (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.h2
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)