Merge tag 'omap-for-v4.15/defconfig-v2-signed' of ssh://gitolite.kernel.org/pub/scm...

[linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 3bdd8da90f6921825d0f08174ea2a57013ea1d66..e96e3a14533cda199963fe96b97dc78779c66037 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -70,7 +70,6 @@
 #include <linux/kgdb.h>
 #include <linux/ftrace.h>
 #include <linux/async.h>
-#include <linux/kmemcheck.h>
 #include <linux/sfi.h>
 #include <linux/shmem_fs.h>
 #include <linux/slab.h>
@@ -563,7 +562,6 @@ asmlinkage __visible void __init start_kernel(void)
         * kmem_cache_init()
         */
        setup_log_buf(0);
-       pidhash_init();
        vfs_caches_init_early();
        sort_main_extable();
        trap_init();
@@ -590,6 +588,12 @@ asmlinkage __visible void __init start_kernel(void)
                local_irq_disable();
        radix_tree_init();
 
+       /*
+        * Set up housekeeping before setting up workqueues to allow the unbound
+        * workqueue to take non-housekeeping into account.
+        */
+       housekeeping_init();
+
        /*
         * Allow workqueue creation and work item queueing/cancelling
         * early.  Work item execution depends on kthreads and starts after
@@ -607,7 +611,6 @@ asmlinkage __visible void __init start_kernel(void)
        early_irq_init();
        init_IRQ();
        tick_init();
-       housekeeping_init();
        rcu_init_nohz();
        init_timers();
        hrtimers_init();
@@ -670,7 +673,7 @@ asmlinkage __visible void __init start_kernel(void)
        if (late_time_init)
                late_time_init();
        calibrate_delay();
-       pidmap_init();
+       pid_idr_init();
        anon_vma_init();
 #ifdef CONFIG_X86
        if (efi_enabled(EFI_RUNTIME_SERVICES))