Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ce6494d authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

stop_machine: convert cpu notifier to return encapsulate errno value 



In commit e6bde73b ("cpu-hotplug: return
better errno on cpu hotplug failure"), the cpu notifier can return an
encapsulated errno value.

This converts the cpu notifier to return an encapsulated errno value for
stop_machine().

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ca51c5a7

kernel/stop_machine.c

+2 −2
Original line number Diff line number Diff line
@@ -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);