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

Commit 8fa1d7d3 authored by Satoru Takeuchi's avatar Satoru Takeuchi Committed by Linus Torvalds
Browse files

[PATCH] cpu-hotplug: release `workqueue_mutex' properly on CPU hot-remove 



_cpu_down() acquires `workqueue_mutex' on its process, but doen't release it
if __cpu_disable() fails.

Signed-off-by: default avatarSatoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bb1d8605

kernel/cpu.c

+6 −6
Original line number Diff line number Diff line
@@ -150,18 +150,18 @@ static int _cpu_down(unsigned int cpu) 
	p = __stop_machine_run(take_cpu_down, NULL, cpu);

	mutex_unlock(&cpu_bitmask_lock);



	if (IS_ERR(p)) {

	if (IS_ERR(p) || cpu_online(cpu)) {

		/* CPU didn't die: tell everyone.  Can't complain. */

		if (raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED,

				(void *)(long)cpu) == NOTIFY_BAD)

			BUG();



		if (IS_ERR(p)) {

			err = PTR_ERR(p);

			goto out_allowed;

		}



	if (cpu_online(cpu))

		goto out_thread;

	}



	/* Wait for it to sleep (leaving idle task). */

	while (!idle_cpu(cpu))