From 8789293352c56f28afa63ff719f098c950287e13 Mon Sep 17 00:00:00 2001
From: Satyam Sharma <ssatyam@cse.iitk.ac.in>
Date: Tue, 31 Jul 2007 00:39:16 -0700
Subject: [PATCH] --- yaml --- r: 63362 b: refs/heads/master c:
 e804a4a4dd596d853f6d6f814fbdcf97b8efcdea h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/kernel/kthread.c | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index febbb6230643..014b291dc072 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbe06f6bf7e764a9eb0e3cdcec2b12c743f35757
+refs/heads/master: e804a4a4dd596d853f6d6f814fbdcf97b8efcdea
diff --git a/trunk/kernel/kthread.c b/trunk/kernel/kthread.c
index a404f7ee7395..dcfe724300eb 100644
--- a/trunk/kernel/kthread.c
+++ b/trunk/kernel/kthread.c
@@ -214,23 +214,15 @@ int kthread_stop(struct task_struct *k)
 }
 EXPORT_SYMBOL(kthread_stop);
 
-
-static noinline __init_refok void kthreadd_setup(void)
+int kthreadd(void *unused)
 {
 	struct task_struct *tsk = current;
 
+	/* Setup a clean context for our children to inherit. */
 	set_task_comm(tsk, "kthreadd");
-
 	ignore_signals(tsk);
-
 	set_user_nice(tsk, -5);
 	set_cpus_allowed(tsk, CPU_MASK_ALL);
-}
-
-int kthreadd(void *unused)
-{
-	/* Setup a clean context for our children to inherit. */
-	kthreadd_setup();
 
 	current->flags |= PF_NOFREEZE;