Messages in this thread | | | Date | Tue, 25 May 2010 12:12:52 -0700 (PDT) | From | Linus Torvalds <> | Subject | Re: [tip:timers/urgent] timers: Fix slack calculation really |
| |
On Tue, 25 May 2010, tip-bot for Thomas Gleixner wrote: > { > - unsigned long expires_limit, mask; > + unsigned long expires_limit, mask, now; > int bit; > > expires_limit = expires; > > - if (timer->slack > -1) > + if (timer->slack >= 0) { > expires_limit = expires + timer->slack; > - else if (time_after(expires, jiffies)) /* auto slack: use 0.4% */ > - expires_limit = expires + (expires - jiffies)/256; > - > + } else { > + now = jiffies;
So this works, but I'd really suggest that you actually nest the declarations correctly too.
Linus
| |