diff options
| author | Tejun Heo <tj@kernel.org> | 2016-10-19 18:12:40 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-10-19 18:12:40 +0200 |
| commit | 8bc4a04455969c36bf54a942ad9d28d80969ed51 (patch) | |
| tree | 9fb87b458122c05f77b1fba28405761bedbcac1d /init | |
| parent | Linux 4.9-rc1 (diff) | |
| parent | workqueue: move wq_numa_init() to workqueue_init() (diff) | |
| download | linux-8bc4a04455969c36bf54a942ad9d28d80969ed51.tar.xz linux-8bc4a04455969c36bf54a942ad9d28d80969ed51.zip | |
Merge branch 'for-4.9' into for-4.10
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 2858be732f6d..9af9274525b5 100644 --- a/init/main.c +++ b/init/main.c @@ -551,6 +551,14 @@ asmlinkage __visible void __init start_kernel(void) "Interrupts were enabled *very* early, fixing it\n")) local_irq_disable(); idr_init_cache(); + + /* + * Allow workqueue creation and work item queueing/cancelling + * early. Work item execution depends on kthreads and starts after + * workqueue_init(). + */ + workqueue_init_early(); + rcu_init(); /* trace_printk() and trace points may be used after this */ @@ -1006,6 +1014,8 @@ static noinline void __init kernel_init_freeable(void) smp_prepare_cpus(setup_max_cpus); + workqueue_init(); + do_pre_smp_initcalls(); lockup_detector_init(); |