Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 15d2bace5ec907530a3d0e0cf4bb1bd29f3ad7b7

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent 2ca7d93bb2
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

include/linux/timer.h
Diff comments   View file @ 15d2bac
... ... @@ -78,8 +78,9 @@
78 78 * Timers with an ->expired field in the past will be executed in the next
79 79 * timer tick.
80 80 */
81   -static inline void add_timer(struct timer_list * timer)
  81 +static inline void add_timer(struct timer_list *timer)
82 82 {
  83 + BUG_ON(timer_pending(timer));
83 84 __mod_timer(timer, timer->expires);
84 85 }
85 86