Pull release into acpica branch

2 files changed, 9 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d5a1a1228fab..ea097e0a9c02 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -60,8 +60,8 @@ config INIT_ENV_ARG_LIMIT
         default 32 if !USERMODE
         default 128 if USERMODE
         help
-          This is the value of the two limits on the number of argument and of
-          env.var passed to init from the kernel command line.
+          Maximum of each of the number of arguments and environment
+          variables passed to init from the kernel command line.
 
 endmenu
 
@@ -501,3 +501,7 @@ config STOP_MACHINE
         help
           Need stop_machine() primitive.
 endmenu
+
+menu "Block layer"
+source "block/Kconfig"
+endmenu
diff --git a/init/main.c b/init/main.c
index f142d4035341..27f97f9b4636 100644
--- a/init/main.c
+++ b/init/main.c
@@ -394,14 +394,16 @@ static void noinline rest_init(void)
         kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND);
         numa_default_policy();
         unlock_kernel();
-        preempt_enable_no_resched();
 
         /*
          * The boot idle thread must execute schedule()
          * at least one to get things moving:
          */
+        preempt_enable_no_resched();
         schedule();
+        preempt_disable();
 
+        /* Call into cpu_idle with preempt disabled */
         cpu_idle();
 }