Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index d8decb8..2454172 100644 (file)
--- 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;
@@ -1683,11 +1684,14 @@ static int __cpuinit timer_cpu_notify(struct notifier_block *self,
                                unsigned long action, void *hcpu)
 {
        long cpu = (long)hcpu;
+       int err;
+
        switch(action) {
        case CPU_UP_PREPARE:
        case CPU_UP_PREPARE_FROZEN:
-               if (init_timers_cpu(cpu) < 0)
-                       return NOTIFY_BAD;
+               err = init_timers_cpu(cpu);
+               if (err < 0)
+                       return notifier_from_errno(err);
                break;
 #ifdef CONFIG_HOTPLUG_CPU
        case CPU_DEAD: