Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / linux / timer.h

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 2e78fedfc06929bfeb7ed70c380e60f31dcf3cba..221f81ac2002b29a454855b918fd106f069413ad 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -76,9 +76,11 @@ static inline void add_timer(struct timer_list * timer)
 }
 
 #ifdef CONFIG_SMP
+  extern int try_to_del_timer_sync(struct timer_list *timer);
   extern int del_timer_sync(struct timer_list *timer);
 #else
-# define del_timer_sync(t) del_timer(t)
+# define try_to_del_timer_sync(t)      del_timer(t)
+# define del_timer_sync(t)             del_timer(t)
 #endif
 
 #define del_singleshot_timer_sync(t) del_timer_sync(t)