Merge tag 'x86-cleanups-2024-03-11' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index d60bc4b23dd47024bd66c8b04f1217bd374b2c80..7dce08198b13352357a1262138c71460da1cb584 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -99,6 +99,7 @@
 #include <linux/init_syscalls.h>
 #include <linux/stackdepot.h>
 #include <linux/randomize_kstack.h>
+#include <linux/pidfs.h>
 #include <net/net_namespace.h>
 
 #include <asm/io.h>
@@ -603,7 +604,6 @@ static int __init rdinit_setup(char *str)
 __setup("rdinit=", rdinit_setup);
 
 #ifndef CONFIG_SMP
-static const unsigned int setup_max_cpus = NR_CPUS;
 static inline void setup_nr_cpu_ids(void) { }
 static inline void smp_prepare_cpus(unsigned int maxcpus) { }
 #endif
@@ -1063,6 +1063,7 @@ void start_kernel(void)
        seq_file_init();
        proc_root_init();
        nsfs_init();
+       pidfs_init();
        cpuset_init();
        cgroup_init();
        taskstats_init_early();
@@ -1549,6 +1550,7 @@ static noinline void __init kernel_init_freeable(void)
        sched_init_smp();
 
        workqueue_init_topology();
+       async_init();
        padata_init();
        page_alloc_init_late();