X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=init%2Fmain.c;h=27f97f9b46362c4fa316619fdcc8e0d29751bbd3;hb=26205e026cf2b3bb039d6169978ae520973f4141;hp=f142d403534190f4588b3d7eda585112077e0607;hpb=1077682b2f97cee76a79cf38bab3fa022a97d9f8;p=linux-2.6

diff --git a/init/main.c b/init/main.c
index f142d40353..27f97f9b46 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();
 }