Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

1 files changed, 12 insertions, 5 deletions

diff --git a/kernel/timer.c b/kernel/timer.c
index be394af5bc22..2454172a80d3 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -752,11 +752,15 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires)
 
         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 {
+                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;
+        }
         mask = expires ^ expires_limit;
         if (mask == 0)
                 return expires;
@@ -1680,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: