Commit 15d2bace authored Oct 30, 2005 by Andrew Morton Committed by Linus Torvalds Oct 30, 2005

[PATCH] add_timer() of a pending timer is illegal



In the recent timer rework we lost the check for an add_timer() of an
already-pending timer.  That check was useful for networking, so put it back.

Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 2ca7d93b

include/linux/timer.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -80,6 +80,7 @@ extern unsigned long next_timer_interrupt(void);
		*/
		static inline void add_timer(struct timer_list *timer)
		{
		BUG_ON(timer_pending(timer));
		__mod_timer(timer, timer->expires);
		}