aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuresh Siddha <suresh.b.siddha@intel.com>2010-07-30 17:57:37 -0400
committerTejun Heo <tj@kernel.org>2010-08-01 07:05:29 -0400
commit6ee0578b4daaea01c96b172c6aacca43fd9807a6 (patch)
treebb82bb4e2a95704477da6c527b23af59c8c2a041
parent098849516dd522a343e659740c8f1394a5b7fa69 (diff)
workqueue: mark init_workqueues() as early_initcall()
Mark init_workqueues() as early_initcall() and thus it will be initialized before smp bringup. init_workqueues() registers for the hotcpu notifier and thus it should cope with the processors that are brought online after the workqueues are initialized. x86 smp bringup code uses workqueues and uses a workaround for the cold boot process (as the workqueues are initialized post smp_init()). Marking init_workqueues() as early_initcall() will pave the way for cleaning up this code. Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--include/linux/workqueue.h1
-rw-r--r--init/main.c2
-rw-r--r--kernel/workqueue.c4
3 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 5f76001c4e6..51dc9a727e5 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -327,7 +327,6 @@ extern int schedule_delayed_work_on(int cpu, struct delayed_work *work,
327extern int schedule_on_each_cpu(work_func_t func); 327extern int schedule_on_each_cpu(work_func_t func);
328extern int keventd_up(void); 328extern int keventd_up(void);
329 329
330extern void init_workqueues(void);
331int execute_in_process_context(work_func_t fn, struct execute_work *); 330int execute_in_process_context(work_func_t fn, struct execute_work *);
332 331
333extern int flush_work(struct work_struct *work); 332extern int flush_work(struct work_struct *work);
diff --git a/init/main.c b/init/main.c
index 3bdb152f412..5f2ec2cdd90 100644
--- a/init/main.c
+++ b/init/main.c
@@ -32,7 +32,6 @@
32#include <linux/start_kernel.h> 32#include <linux/start_kernel.h>
33#include <linux/security.h> 33#include <linux/security.h>
34#include <linux/smp.h> 34#include <linux/smp.h>
35#include <linux/workqueue.h>
36#include <linux/profile.h> 35#include <linux/profile.h>
37#include <linux/rcupdate.h> 36#include <linux/rcupdate.h>
38#include <linux/moduleparam.h> 37#include <linux/moduleparam.h>
@@ -786,7 +785,6 @@ static void __init do_initcalls(void)
786 */ 785 */
787static void __init do_basic_setup(void) 786static void __init do_basic_setup(void)
788{ 787{
789 init_workqueues();
790 cpuset_init_smp(); 788 cpuset_init_smp();
791 usermodehelper_init(); 789 usermodehelper_init();
792 init_tmpfs(); 790 init_tmpfs();
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 1105c474073..e2eb351d915 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3507,7 +3507,7 @@ out_unlock:
3507} 3507}
3508#endif /* CONFIG_FREEZER */ 3508#endif /* CONFIG_FREEZER */
3509 3509
3510void __init init_workqueues(void) 3510static int __init init_workqueues(void)
3511{ 3511{
3512 unsigned int cpu; 3512 unsigned int cpu;
3513 int i; 3513 int i;
@@ -3559,4 +3559,6 @@ void __init init_workqueues(void)
3559 system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND, 3559 system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND,
3560 WQ_UNBOUND_MAX_ACTIVE); 3560 WQ_UNBOUND_MAX_ACTIVE);
3561 BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq); 3561 BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq);
3562 return 0;
3562} 3563}
3564early_initcall(init_workqueues);