Skip to contentSkip to conversation

core urgent updates for 3.9-rc1

GIT PULL Thomas Gleixner 1 participant 1 message Mar 4, 2013 CPU hotplug

lore
Share & tools
lore
#0 lore raw

Linus,

please pull the latest core-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

* Single bugfix for a regression introduced with the conversion of the stop machine threads to the generic smpboot thread management facility

Thanks,

tglx

------------------>
Thomas Gleixner (1):
stop_machine: Mark per cpu stopper enabled early

 include/linux/smpboot.h |    4 ++++
 kernel/smpboot.c        |    2 ++
 kernel/stop_machine.c   |    2 +-
 3 files changed, 7 insertions(+), 1 deletions(-)
include/linux/smpboot.h +4 -0
index c65dee0..13e9296 100644
@@ -24,6 +24,9 @@ struct smpboot_thread_data;
  *			parked (cpu offline)
  * @unpark:		Optional unpark function, called when the thread is
  *			unparked (cpu online)
+ * @pre_unpark:		Optional unpark function, called before the thread is
+ *			unparked (cpu online). This is not guaranteed to be
+ *			called on the target cpu of the thread. Careful!
  * @selfparking:	Thread is not parked by the park function.
  * @thread_comm:	The base name of the thread
  */
@@ -37,6 +40,7 @@ struct smp_hotplug_thread {
 	void				(*cleanup)(unsigned int cpu, bool online);
 	void				(*park)(unsigned int cpu);
 	void				(*unpark)(unsigned int cpu);
+	void				(*pre_unpark)(unsigned int cpu);
 	bool				selfparking;
 	const char			*thread_comm;
 };
kernel/smpboot.c +2 -0
index d4abac2..8eaed9a 100644
@@ -209,6 +209,8 @@ static void smpboot_unpark_thread(struct smp_hotplug_thread *ht, unsigned int cp
 {
 	struct task_struct *tsk = *per_cpu_ptr(ht->store, cpu);
 
+	if (ht->pre_unpark)
+		ht->pre_unpark(cpu);
 	kthread_unpark(tsk);
 }
 
kernel/stop_machine.c +1 -1
index 95d178c..c09f295 100644
@@ -336,7 +336,7 @@ static struct smp_hotplug_thread cpu_stop_threads = {
 	.create			= cpu_stop_create,
 	.setup			= cpu_stop_unpark,
 	.park			= cpu_stop_park,
-	.unpark			= cpu_stop_unpark,
+	.pre_unpark		= cpu_stop_unpark,
 	.selfparking		= true,
 };