Merge branch 'akpm' (patches from Andrew)

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

diff --git a/init/main.c b/init/main.c
index f6dd8fe1f22c48befa41a760ee30956867c8116d..a7e969d12f51a8a629f74d7bf10920ea7fef967b 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -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