diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-26 10:07:13 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-26 10:07:13 -0400 |
commit | 2abfb9e1d470f7082e5e20e4b11a271a0124211b (patch) | |
tree | 1f8d81f07099bbdf16486570855d130bcffa789d /kernel/timer.c | |
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/timer.c')
-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 d8decb8d46b0..22118342a456 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -747,7 +747,7 @@ EXPORT_SYMBOL(mod_timer_pending); | |||
747 | static inline | 747 | static inline |
748 | unsigned long apply_slack(struct timer_list *timer, unsigned long expires) | 748 | unsigned long apply_slack(struct timer_list *timer, unsigned long expires) |
749 | { | 749 | { |
750 | unsigned long expires_limit, mask, now; | 750 | unsigned long expires_limit, mask; |
751 | int bit; | 751 | int bit; |
752 | 752 | ||
753 | expires_limit = expires; | 753 | expires_limit = expires; |
@@ -755,7 +755,8 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires) | |||
755 | if (timer->slack >= 0) { | 755 | if (timer->slack >= 0) { |
756 | expires_limit = expires + timer->slack; | 756 | expires_limit = expires + timer->slack; |
757 | } else { | 757 | } else { |
758 | now = jiffies; | 758 | unsigned long now = jiffies; |
759 | |||
759 | /* No slack, if already expired else auto slack 0.4% */ | 760 | /* No slack, if already expired else auto slack 0.4% */ |
760 | if (time_after(expires, now)) | 761 | if (time_after(expires, now)) |
761 | expires_limit = expires + (expires - now)/256; | 762 | expires_limit = expires + (expires - now)/256; |