summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2005-02-01 16:31:29 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-02-01 16:31:29 -0800
commit3d0ddc0d2adbe377821431176e9e3d3689b36d2d (patch)
treef047cc7c50b9e415431984a614cbd463b87ddb98
parentfc8691bf721f8df02142cee027f2ba553da471e2 (diff)
[PATCH] rest_init() local irq fix
It's not necessary to keep IRQs disabled after the BKL has been dropped. In fact i think IRQ-disabling doesnt have to be done at all, the patch below ought to solve this scenario equally well, and should solve the PPC side-effects too. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--init/main.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/init/main.c b/init/main.c
index dfc7a1375874..6849397dd475 100644
--- a/init/main.c
+++ b/init/main.c
@@ -373,14 +373,9 @@ static void noinline rest_init(void)
{
kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND);
numa_default_policy();
- /*
- * Re-enable preemption but disable interrupts to make sure
- * we dont get preempted until we schedule() in cpu_idle().
- */
- local_irq_disable();
- preempt_enable_no_resched();
unlock_kernel();
- cpu_idle();
+ preempt_enable_no_resched();
+ cpu_idle();
}
/* Check for early params. */