diff options
author | Tejun Heo <tj@kernel.org> | 2016-10-19 12:12:40 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-10-19 12:12:40 -0400 |
commit | 8bc4a04455969c36bf54a942ad9d28d80969ed51 (patch) | |
tree | 9fb87b458122c05f77b1fba28405761bedbcac1d /init | |
parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
parent | 2186d9f940b6a04f263a3bacd48f2a7ba96df4cf (diff) | |
download | op-kernel-dev-8bc4a04455969c36bf54a942ad9d28d80969ed51.zip op-kernel-dev-8bc4a04455969c36bf54a942ad9d28d80969ed51.tar.gz |
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 2858be7..9af9274 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(); |