aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/timer.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/timer.h')
-rw-r--r--include/linux/timer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index a2d1eb6cb3f0..af92a91b5569 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -225,10 +225,12 @@ static inline void timer_stats_timer_clear_start_info(struct timer_list *timer)
225 225
226extern void add_timer(struct timer_list *timer); 226extern void add_timer(struct timer_list *timer);
227 227
228#ifdef CONFIG_SMP 228#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_SOFTIRQS)
229 extern int timer_pending_sync(struct timer_list *timer);
229 extern int try_to_del_timer_sync(struct timer_list *timer); 230 extern int try_to_del_timer_sync(struct timer_list *timer);
230 extern int del_timer_sync(struct timer_list *timer); 231 extern int del_timer_sync(struct timer_list *timer);
231#else 232#else
233# define timer_pending_sync(t) timer_pending(t)
232# define try_to_del_timer_sync(t) del_timer(t) 234# define try_to_del_timer_sync(t) del_timer(t)
233# define del_timer_sync(t) del_timer(t) 235# define del_timer_sync(t) del_timer(t)
234#endif 236#endif