From 4d979880415258abd174aee6ae25cc26a4b25ea5 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Tue, 26 Oct 2010 14:22:45 -0700 Subject: [PATCH] --- yaml --- r: 217540 b: refs/heads/master c: 4ce6494dbd8909718840bb88d5a699ef6ce5c212 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/stop_machine.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a6ec6d364531..a2a9e1879335 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca51c5a76345b28c6f1b742f9f5f0a6fc9afd9ca +refs/heads/master: 4ce6494dbd8909718840bb88d5a699ef6ce5c212 diff --git a/trunk/kernel/stop_machine.c b/trunk/kernel/stop_machine.c index 3cb4a9a8ae1c..2df820b03beb 100644 --- a/trunk/kernel/stop_machine.c +++ b/trunk/kernel/stop_machine.c @@ -304,7 +304,7 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb, p = kthread_create(cpu_stopper_thread, stopper, "migration/%d", cpu); if (IS_ERR(p)) - return NOTIFY_BAD; + return notifier_from_errno(PTR_ERR(p)); get_task_struct(p); kthread_bind(p, cpu); sched_set_stop_task(cpu, p); @@ -372,7 +372,7 @@ static int __init cpu_stop_init(void) /* start one for the boot cpu */ err = cpu_stop_cpu_callback(&cpu_stop_cpu_notifier, CPU_UP_PREPARE, bcpu); - BUG_ON(err == NOTIFY_BAD); + BUG_ON(err != NOTIFY_OK); cpu_stop_cpu_callback(&cpu_stop_cpu_notifier, CPU_ONLINE, bcpu); register_cpu_notifier(&cpu_stop_cpu_notifier);