Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index f6dd8fe..2115055 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -91,7 +91,7 @@
 static int kernel_init(void *);
 
 extern void init_IRQ(void);
-extern void fork_init(unsigned long);
+extern void fork_init(void);
 extern void radix_tree_init(void);
 #ifndef CONFIG_DEBUG_RODATA
 static inline void mark_rodata_ro(void) { }
@@ -144,7 +144,7 @@ EXPORT_SYMBOL_GPL(static_key_initialized);
  * rely on the BIOS and skip the reset operation.
  *
  * This is useful if kernel is booting in an unreliable environment.
- * For ex. kdump situaiton where previous kernel has crashed, BIOS has been
+ * For ex. kdump situation where previous kernel has crashed, BIOS has been
  * skipped and devices will be in unknown state.
  */
 unsigned int reset_devices;
@@ -385,6 +385,7 @@ static noinline void __init_refok rest_init(void)
        int pid;
 
        rcu_scheduler_starting();
+       smpboot_thread_init();
        /*
         * We need to spawn init first so that it obtains pid 1, however
         * the init task will end up wanting to create kthreads, which, if
@@ -644,7 +645,7 @@ asmlinkage __visible void __init start_kernel(void)
 #endif
        thread_info_cache_init();
        cred_init();
-       fork_init(totalram_pages);
+       fork_init();
        proc_caches_init();
        buffer_init();
        key_init();