diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-26 16:07:13 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-26 16:07:13 +0200 |
| commit | 2abfb9e1d470f7082e5e20e4b11a271a0124211b (patch) | |
| tree | 1f8d81f07099bbdf16486570855d130bcffa789d /kernel | |
| parent | 8e63d7795e30b4091e303cc8c060509bd8eea742 (diff) | |
timers: Move local variable into else section
Fix nit-picking coding style detail.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/timer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index d8decb8d46b..22118342a45 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -747,7 +747,7 @@ EXPORT_SYMBOL(mod_timer_pending); static inline unsigned long apply_slack(struct timer_list *timer, unsigned long expires) { - unsigned long expires_limit, mask, now; + unsigned long expires_limit, mask; int bit; expires_limit = expires; @@ -755,7 +755,8 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires) if (timer->slack >= 0) { expires_limit = expires + timer->slack; } else { - now = jiffies; + unsigned long now = jiffies; + /* No slack, if already expired else auto slack 0.4% */ if (time_after(expires, now)) expires_limit = expires + (expires - now)/256; |