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

Commit b9d9d691 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

smp/hotplug: Undo tglxs brainfart 



The attempt to prevent overwriting an active state resulted in a
disaster which effectively disables all dynamically allocated hotplug
states.

Cleanup the mess.

Fixes: dc280d93 ("cpu/hotplug: Prevent overwriting of callbacks")
Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
Reported-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4b8664d

kernel/cpu.c

+8 −1
Original line number Diff line number Diff line
@@ -1471,6 +1471,7 @@ int __cpuhp_setup_state(enum cpuhp_state state, 
			bool multi_instance)

{

	int cpu, ret = 0;

	bool dynstate;



	if (cpuhp_cb_check(state) || !name)

		return -EINVAL;
@@ -1480,6 +1481,12 @@ int __cpuhp_setup_state(enum cpuhp_state state, 
	ret = cpuhp_store_callbacks(state, name, startup, teardown,

				    multi_instance);



	dynstate = state == CPUHP_AP_ONLINE_DYN;

	if (ret > 0 && dynstate) {

		state = ret;

		ret = 0;

	}



	if (ret || !invoke || !startup)

		goto out;
@@ -1508,7 +1515,7 @@ int __cpuhp_setup_state(enum cpuhp_state state, 
	 * If the requested state is CPUHP_AP_ONLINE_DYN, return the

	 * dynamically allocated state in case of success.

	 */

	if (!ret && state == CPUHP_AP_ONLINE_DYN)

	if (!ret && dynstate)

		return state;

	return ret;

}