kernel/: convert cpu notifier to return encapsulate errno value

By the previous modification, the cpu notifier can return encapsulate
errno value.  This converts the cpu notifiers for kernel/*.c

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/kernel/padata.c b/kernel/padata.c
index b1c9857..fdd8ae6 100644 (file)
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -659,7 +659,7 @@ static int padata_cpu_callback(struct notifier_block *nfb,
                err = __padata_add_cpu(pinst, cpu);
                mutex_unlock(&pinst->lock);
                if (err)
                err = __padata_add_cpu(pinst, cpu);
                mutex_unlock(&pinst->lock);
                if (err)

-                       return NOTIFY_BAD;
+                       return notifier_from_errno(err);

                break;
 
        case CPU_DOWN_PREPARE:
                break;
 
        case CPU_DOWN_PREPARE:


@@ -670,7 +670,7 @@ static int padata_cpu_callback(struct notifier_block *nfb,
                err = __padata_remove_cpu(pinst, cpu);
                mutex_unlock(&pinst->lock);
                if (err)
                err = __padata_remove_cpu(pinst, cpu);
                mutex_unlock(&pinst->lock);
                if (err)

-                       return NOTIFY_BAD;
+                       return notifier_from_errno(err);

                break;
 
        case CPU_UP_CANCELED:
                break;
 
        case CPU_UP_CANCELED:

diff --git a/kernel/profile.c b/kernel/profile.c
index dfadc5b..1e6a0d9 100644 (file)
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -372,7 +372,7 @@ static int __cpuinit profile_cpu_callback(struct notifier_block *info,
                                        GFP_KERNEL | __GFP_ZERO,
                                        0);
                        if (!page)
                                        GFP_KERNEL | __GFP_ZERO,
                                        0);
                        if (!page)

-                               return NOTIFY_BAD;
+                               return notifier_from_errno(-ENOMEM);

                        per_cpu(cpu_profile_hits, cpu)[1] = page_address(page);
                }
                if (!per_cpu(cpu_profile_hits, cpu)[0]) {
                        per_cpu(cpu_profile_hits, cpu)[1] = page_address(page);
                }
                if (!per_cpu(cpu_profile_hits, cpu)[0]) {


@@ -388,7 +388,7 @@ out_free:
                page = virt_to_page(per_cpu(cpu_profile_hits, cpu)[1]);
                per_cpu(cpu_profile_hits, cpu)[1] = NULL;
                __free_page(page);
                page = virt_to_page(per_cpu(cpu_profile_hits, cpu)[1]);
                per_cpu(cpu_profile_hits, cpu)[1] = NULL;
                __free_page(page);

-               return NOTIFY_BAD;
+               return notifier_from_errno(-ENOMEM);

        case CPU_ONLINE:
        case CPU_ONLINE_FROZEN:
                if (prof_cpu_mask != NULL)
        case CPU_ONLINE:
        case CPU_ONLINE_FROZEN:
                if (prof_cpu_mask != NULL)

diff --git a/kernel/relay.c b/kernel/relay.c
index 4268287..c7cf397 100644 (file)
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -539,7 +539,7 @@ static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb,
                                        "relay_hotcpu_callback: cpu %d buffer "
                                        "creation failed\n", hotcpu);
                                mutex_unlock(&relay_channels_mutex);
                                        "relay_hotcpu_callback: cpu %d buffer "
                                        "creation failed\n", hotcpu);
                                mutex_unlock(&relay_channels_mutex);

-                               return NOTIFY_BAD;
+                               return notifier_from_errno(-ENOMEM);

                        }
                }
                mutex_unlock(&relay_channels_mutex);
                        }
                }
                mutex_unlock(&relay_channels_mutex);

diff --git a/kernel/smp.c b/kernel/smp.c
index 3fc6973..75c970c 100644 (file)
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -52,7 +52,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
        case CPU_UP_PREPARE_FROZEN:
                if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL,
                                cpu_to_node(cpu)))
        case CPU_UP_PREPARE_FROZEN:
                if (!zalloc_cpumask_var_node(&cfd->cpumask, GFP_KERNEL,
                                cpu_to_node(cpu)))

-                       return NOTIFY_BAD;
+                       return notifier_from_errno(-ENOMEM);

                break;
 
 #ifdef CONFIG_HOTPLUG_CPU
                break;
 
 #ifdef CONFIG_HOTPLUG_CPU

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 0db913a..825e112 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -808,7 +808,7 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,
                p = kthread_create(run_ksoftirqd, hcpu, "ksoftirqd/%d", hotcpu);
                if (IS_ERR(p)) {
                        printk("ksoftirqd for %i failed\n", hotcpu);
                p = kthread_create(run_ksoftirqd, hcpu, "ksoftirqd/%d", hotcpu);
                if (IS_ERR(p)) {
                        printk("ksoftirqd for %i failed\n", hotcpu);

-                       return NOTIFY_BAD;
+                       return notifier_from_errno(PTR_ERR(p));

                }
                kthread_bind(p, hotcpu);
                per_cpu(ksoftirqd, hotcpu) = p;
                }
                kthread_bind(p, hotcpu);
                per_cpu(ksoftirqd, hotcpu) = p;

diff --git a/kernel/timer.c b/kernel/timer.c
index be394af..e3b8c69 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;
                                unsigned long action, void *hcpu)
 {
        long cpu = (long)hcpu;

+       int err;
+

        switch(action) {
        case CPU_UP_PREPARE:
        case CPU_UP_PREPARE_FROZEN:
        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:
                break;
 #ifdef CONFIG_HOTPLUG_CPU
        case CPU_DEAD:

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 77dabbf..327d2de 100644 (file)
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1110,7 +1110,7 @@ static int __devinit workqueue_cpu_callback(struct notifier_block *nfb,
        unsigned int cpu = (unsigned long)hcpu;
        struct cpu_workqueue_struct *cwq;
        struct workqueue_struct *wq;
        unsigned int cpu = (unsigned long)hcpu;
        struct cpu_workqueue_struct *cwq;
        struct workqueue_struct *wq;

-       int ret = NOTIFY_OK;
+       int err = 0;

 
        action &= ~CPU_TASKS_FROZEN;
 
 
        action &= ~CPU_TASKS_FROZEN;
 


@@ -1124,12 +1124,13 @@ undo:
 
                switch (action) {
                case CPU_UP_PREPARE:
 
                switch (action) {
                case CPU_UP_PREPARE:

-                       if (!create_workqueue_thread(cwq, cpu))
+                       err = create_workqueue_thread(cwq, cpu);
+                       if (!err)

                                break;
                        printk(KERN_ERR "workqueue [%s] for %i failed\n",
                                wq->name, cpu);
                        action = CPU_UP_CANCELED;
                                break;
                        printk(KERN_ERR "workqueue [%s] for %i failed\n",
                                wq->name, cpu);
                        action = CPU_UP_CANCELED;

-                       ret = NOTIFY_BAD;
+                       err = -ENOMEM;

                        goto undo;
 
                case CPU_ONLINE:
                        goto undo;
 
                case CPU_ONLINE:


@@ -1150,7 +1151,7 @@ undo:
                cpumask_clear_cpu(cpu, cpu_populated_map);
        }
 
                cpumask_clear_cpu(cpu, cpu_populated_map);
        }
 

-       return ret;
+       return notifier_from_errno(err);

 }
 
 #ifdef CONFIG_SMP
 }
 
 #ifdef CONFIG_SMP