2 files changed, 8 insertions, 2 deletions

diff --git a/include/linux/smpboot.h b/include/linux/smpboot.h
index e0106d8581d3..c65dee059913 100644
--- a/include/linux/smpboot.h
+++ b/include/linux/smpboot.h
@@ -14,6 +14,8 @@ struct smpboot_thread_data;
  * @thread_should_run:  Check whether the thread should run or not. Called with
  *                      preemption disabled.
  * @thread_fn:          The associated thread function
+ * @create:             Optional setup function, called when the thread gets
+ *                      created (Not called from the thread context)
  * @setup:              Optional setup function, called when the thread gets
  *                      operational the first time
  * @cleanup:            Optional cleanup function, called when the thread
@@ -22,6 +24,7 @@ struct smpboot_thread_data;
  *                      parked (cpu offline)
  * @unpark:             Optional unpark function, called when the thread is
  *                      unparked (cpu online)
+ * @selfparking:        Thread is not parked by the park function.
  * @thread_comm:        The base name of the thread
  */
 struct smp_hotplug_thread {
@@ -29,10 +32,12 @@ struct smp_hotplug_thread {
         struct list_head                list;
         int                             (*thread_should_run)(unsigned int cpu);
         void                            (*thread_fn)(unsigned int cpu);
+        void                            (*create)(unsigned int cpu);
         void                            (*setup)(unsigned int cpu);
         void                            (*cleanup)(unsigned int cpu, bool online);
         void                            (*park)(unsigned int cpu);
         void                            (*unpark)(unsigned int cpu);
+        bool                            selfparking;
         const char                      *thread_comm;
 };
 
diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index d6c5fc054242..d4abac261779 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -183,9 +183,10 @@ __smpboot_create_thread(struct smp_hotplug_thread *ht, unsigned int cpu)
                 kfree(td);
                 return PTR_ERR(tsk);
         }
-
         get_task_struct(tsk);
         *per_cpu_ptr(ht->store, cpu) = tsk;
+        if (ht->create)
+                ht->create(cpu);
         return 0;
 }
 
@@ -225,7 +226,7 @@ static void smpboot_park_thread(struct smp_hotplug_thread *ht, unsigned int cpu)
 {
         struct task_struct *tsk = *per_cpu_ptr(ht->store, cpu);
 
-        if (tsk)
+        if (tsk && !ht->selfparking)
                 kthread_park(tsk);
 }