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

Commit 4b43a3bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull CPU hotplug fix from Ingo Molnar:
 "A single fix moving the smp-call queue flush step to the intended
  point in the state machine"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  smp/hotplug: Move step CPUHP_AP_SMPCFD_DYING to the correct place
parents e017b4db 46febd37

kernel/cpu.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1289,11 +1289,6 @@ static struct cpuhp_step cpuhp_bp_states[] = { 
		.teardown.single	= NULL,

		.teardown.single	= NULL,

		.cant_stop		= true,

		.cant_stop		= true,

	},

	},

	[CPUHP_AP_SMPCFD_DYING] = {

		.name			= "smpcfd:dying",

		.startup.single		= NULL,

		.teardown.single	= smpcfd_dying_cpu,

	},

	/*

	/*

	 * Handled on controll processor until the plugged processor manages

	 * Handled on controll processor until the plugged processor manages

	 * this itself.

	 * this itself.
@@ -1335,6 +1330,11 @@ static struct cpuhp_step cpuhp_ap_states[] = { 
		.startup.single		= NULL,

		.startup.single		= NULL,

		.teardown.single	= rcutree_dying_cpu,

		.teardown.single	= rcutree_dying_cpu,

	},

	},

	[CPUHP_AP_SMPCFD_DYING] = {

		.name			= "smpcfd:dying",

		.startup.single		= NULL,

		.teardown.single	= smpcfd_dying_cpu,

	},

	/* Entry state on starting. Interrupts enabled from here on. Transient

	/* Entry state on starting. Interrupts enabled from here on. Transient

	 * state for synchronsization */

	 * state for synchronsization */

	[CPUHP_AP_ONLINE] = {

	[CPUHP_AP_ONLINE] = {