kernel/: convert cpu notifier to return encapsulate errno value

[net-next-2.6.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index be394af5bc22c9eee0e65953141cca231f001d9f..e3b8c697bde44b75b76fb23c059a4b4a3942411d 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1680,11 +1680,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: