vserver 1.9.5.x5

[linux-2.6.git] / kernel / kthread.c

diff --git a/kernel/kthread.c b/kernel/kthread.c
index da0ec5b..dbbc727 100644 (file)
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -14,6 +14,12 @@
 #include <linux/module.h>
 #include <asm/semaphore.h>
 
+/*
+ * We dont want to execute off keventd since it might
+ * hold a semaphore our callers hold too:
+ */
+static struct workqueue_struct *helper_wq;
+
 struct kthread_create_info
 {
        /* Information passed to kthread() from keventd. */
@@ -65,7 +71,6 @@ static int kthread(void *_create)
        void *data;
        sigset_t blocked;
        int ret = -EINTR;
-       cpumask_t mask = CPU_MASK_ALL;
 
        kthread_exit_files();
 
@@ -79,7 +84,7 @@ static int kthread(void *_create)
        flush_signals(current);
 
        /* By default we can run anywhere, unlike keventd. */
-       set_cpus_allowed(current, mask);
+       set_cpus_allowed(current, CPU_MASK_ALL);
 
        /* OK, tell user we're spawned, wait for stop or wakeup */
        __set_current_state(TASK_INTERRUPTIBLE);
@@ -109,7 +114,7 @@ static void keventd_create_kthread(void *_create)
                create->result = ERR_PTR(pid);
        } else {
                wait_for_completion(&create->started);
-               create->result = find_task_by_pid(pid);
+               create->result = find_task_by_real_pid(pid);
        }
        complete(&create->done);
 }
@@ -127,12 +132,13 @@ struct task_struct *kthread_create(int (*threadfn)(void *data),
        init_completion(&create.started);
        init_completion(&create.done);
 
-       /* If we're being called to start the first workqueue, we
-        * can't use keventd. */
-       if (!keventd_up())
+       /*
+        * The workqueue needs to start up first:
+        */
+       if (!helper_wq)
                work.func(work.data);
        else {
-               schedule_work(&work);
+               queue_work(helper_wq, &work);
                wait_for_completion(&create.done);
        }
        if (!IS_ERR(create.result)) {
@@ -184,3 +190,13 @@ int kthread_stop(struct task_struct *k)
        return ret;
 }
 EXPORT_SYMBOL(kthread_stop);
+
+static __init int helper_init(void)
+{
+       helper_wq = create_singlethread_workqueue("kthread");
+       BUG_ON(!helper_wq);
+
+       return 0;
+}
+core_initcall(helper_init);
+