From: Jeff Chua Date: Sun, 23 May 2010 23:16:24 +0000 (+0800) Subject: timers: Fix slack calculation for expired timers X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f00e047efdf9d31c8a7dd7875b411f97cfa7d8e5;p=linux-beck.git timers: Fix slack calculation for expired timers commit 3bbb9ec946 (timers: Introduce the concept of timer slack for legacy timers) does not take the case into account when the timer is already expired. This broke wireless drivers. The solution is not to apply slack to already expired timers. Signed-off-by: Thomas Gleixner Cc: Arjan van de Ven --- diff --git a/kernel/timer.c b/kernel/timer.c index 9199f3c52215..be394af5bc22 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -750,13 +750,14 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires) unsigned long expires_limit, mask; int bit; - expires_limit = expires + timer->slack; + expires_limit = expires; - if (timer->slack < 0) /* auto slack: use 0.4% */ + if (timer->slack > -1) + expires_limit = expires + timer->slack; + else if (time_after(expires, jiffies)) /* auto slack: use 0.4% */ expires_limit = expires + (expires - jiffies)/256; mask = expires ^ expires_limit; - if (mask == 0) return expires;