---

yaml --- r: 11834 b: refs/heads/master c: 15d2bac h: refs/heads/master v: v3
git-mirror · Oct 31, 2005 · f526377 · f526377
1 parent 13a0ca4
commit f526377
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ca7d93bb27876e5fd4ebfcb3b00627107bdad4d
+refs/heads/master: 15d2bace5ec907530a3d0e0cf4bb1bd29f3ad7b7
diff --git a/trunk/include/linux/timer.h b/trunk/include/linux/timer.h
@@ -78,8 +78,9 @@ extern unsigned long next_timer_interrupt(void);
  * Timers with an ->expired field in the past will be executed in the next
  * timer tick.
  */
-static inline void add_timer(struct timer_list * timer)
+static inline void add_timer(struct timer_list *timer)
 {
+	BUG_ON(timer_pending(timer));
 	__mod_timer(timer, timer->expires);
 }