From ffcb289e426e4c57147cbd6372f8d96105471a52 Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Fri, 30 Jul 2010 14:57:37 -0700
Subject: [PATCH] --- yaml --- r: 206255 b: refs/heads/master c:
 6ee0578b4daaea01c96b172c6aacca43fd9807a6 h: refs/heads/master i:   206253:
 29df1f47e1c09d4a096d9dc9594413a991b95115   206251:
 0b1b1c605187faac82c2098181cffee071b5f48c   206247:
 87ea1063e466c21582adbd86b028e909a451175f   206239:
 8e0154926c0dfa843689bb6224d10d91e6f4eea5 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/workqueue.h | 1 -
 trunk/init/main.c               | 2 --
 trunk/kernel/workqueue.c        | 4 +++-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1f501d858c3a..85c6c93b0e89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 098849516dd522a343e659740c8f1394a5b7fa69
+refs/heads/master: 6ee0578b4daaea01c96b172c6aacca43fd9807a6
diff --git a/trunk/include/linux/workqueue.h b/trunk/include/linux/workqueue.h
index 5f76001c4e6d..51dc9a727e5e 100644
--- a/trunk/include/linux/workqueue.h
+++ b/trunk/include/linux/workqueue.h
@@ -327,7 +327,6 @@ extern int schedule_delayed_work_on(int cpu, struct delayed_work *work,
 extern int schedule_on_each_cpu(work_func_t func);
 extern int keventd_up(void);
 
-extern void init_workqueues(void);
 int execute_in_process_context(work_func_t fn, struct execute_work *);
 
 extern int flush_work(struct work_struct *work);
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 3bdb152f412f..5f2ec2cdd900 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -32,7 +32,6 @@
 #include <linux/start_kernel.h>
 #include <linux/security.h>
 #include <linux/smp.h>
-#include <linux/workqueue.h>
 #include <linux/profile.h>
 #include <linux/rcupdate.h>
 #include <linux/moduleparam.h>
@@ -786,7 +785,6 @@ static void __init do_initcalls(void)
  */
 static void __init do_basic_setup(void)
 {
-	init_workqueues();
 	cpuset_init_smp();
 	usermodehelper_init();
 	init_tmpfs();
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index 1105c474073a..e2eb351d9152 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -3507,7 +3507,7 @@ void thaw_workqueues(void)
 }
 #endif /* CONFIG_FREEZER */
 
-void __init init_workqueues(void)
+static int __init init_workqueues(void)
 {
 	unsigned int cpu;
 	int i;
@@ -3559,4 +3559,6 @@ void __init init_workqueues(void)
 	system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND,
 					    WQ_UNBOUND_MAX_ACTIVE);
 	BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq);
+	return 0;
 }
+early_initcall(init_workqueues);