1 files changed, 3 insertions, 3 deletions

diff --git a/kernel/kthread.c b/kernel/kthread.c
index 0ac887882f90..bd1b9ea024e1 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -13,7 +13,6 @@
 #include <linux/file.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
-#include <asm/semaphore.h>
 
 #define KTHREAD_NICE_LEVEL (-5)
 
@@ -99,7 +98,7 @@ static void create_kthread(struct kthread_create_info *create)
                 struct sched_param param = { .sched_priority = 0 };
                 wait_for_completion(&create->started);
                 read_lock(&tasklist_lock);
-                create->result = find_task_by_pid(pid);
+                create->result = find_task_by_pid_ns(pid, &init_pid_ns);
                 read_unlock(&tasklist_lock);
                 /*
                  * root may have changed our (kthreadd's) priority or CPU mask.
@@ -145,9 +144,9 @@ struct task_struct *kthread_create(int (*threadfn)(void *data),
 
         spin_lock(&kthread_create_lock);
         list_add_tail(&create.list, &kthread_create_list);
-        wake_up_process(kthreadd_task);
         spin_unlock(&kthread_create_lock);
 
+        wake_up_process(kthreadd_task);
         wait_for_completion(&create.done);
 
         if (!IS_ERR(create.result)) {
@@ -180,6 +179,7 @@ void kthread_bind(struct task_struct *k, unsigned int cpu)
         wait_task_inactive(k);
         set_task_cpu(k, cpu);
         k->cpus_allowed = cpumask_of_cpu(cpu);
+        k->rt.nr_cpus_allowed = 1;
 }
 EXPORT_SYMBOL(kthread_bind);