[RFC][PATCH 6/6] fixup early boot

[Peter Zijlstra <a.p.zijlstra@chello.nl>]

[-- Attachment #1: preempt-fixup-rest_init.patch --]
[-- Type: text/plain, Size: 880 bytes --]

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
 init/main.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: linux-2.6/init/main.c
===================================================================
--- linux-2.6.orig/init/main.c
+++ linux-2.6/init/main.c
@@ -452,7 +452,8 @@ static void noinline __init_refok rest_i
 	 * at least once to get things moving:
 	 */
 	init_idle_bootup_task(current);
-	preempt_enable_no_resched();
+	_preempt_enable_no_resched();
+
 	schedule();
 	preempt_disable();
 
@@ -556,7 +557,7 @@ asmlinkage void __init start_kernel(void
 	 * Disable preemption - early bootup scheduling is extremely
 	 * fragile until we cpu_idle() for the first time.
 	 */
-	preempt_disable();
+	_preempt_disable();
 	build_all_zonelists();
 	page_alloc_init();
 	printk(KERN_NOTICE "Kernel command line: %s\n", boot_command_line);

--