Merge ../linux-2.6

1 files changed, 3 insertions, 1 deletions

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();
 }