Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/kthread.c b/kernel/kthread.c
index 92cf6930ab51..bd1b9ea024e1 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -98,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.
@@ -144,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)) {