aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2006-07-03 03:24:24 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 18:27:00 -0400
commit93e028148fce0be9787de7fb097fa4c8582b78c1 (patch)
tree3cc4859695f08a54a80bd473e466778474c86522 /init
parent3e541a4ae534a7e59ad464af9abea382b3035724 (diff)
[PATCH] lockdep: console_init after local_irq_enable()
s390's console_init must enable interrupts, but early_boot_irqs_on() gets called later. To avoid problems move console_init() after local_irq_enable(). Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: Ingo Molnar <mingo@elte.hu> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init')
-rw-r--r--init/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c
index c8960b9df623..d604dfef82b8 100644
--- a/init/main.c
+++ b/init/main.c
@@ -498,6 +498,10 @@ asmlinkage void __init start_kernel(void)
498 softirq_init(); 498 softirq_init();
499 timekeeping_init(); 499 timekeeping_init();
500 time_init(); 500 time_init();
501 profile_init();
502 if (!irqs_disabled())
503 printk("start_kernel(): bug: interrupts were enabled early\n");
504 local_irq_enable();
501 505
502 /* 506 /*
503 * HACK ALERT! This is early. We're enabling the console before 507 * HACK ALERT! This is early. We're enabling the console before
@@ -507,10 +511,6 @@ asmlinkage void __init start_kernel(void)
507 console_init(); 511 console_init();
508 if (panic_later) 512 if (panic_later)
509 panic(panic_later, panic_param); 513 panic(panic_later, panic_param);
510 profile_init();
511 if (!irqs_disabled())
512 printk("start_kernel(): bug: interrupts were enabled early\n");
513 local_irq_enable();
514#ifdef CONFIG_BLK_DEV_INITRD 514#ifdef CONFIG_BLK_DEV_INITRD
515 if (initrd_start && !initrd_below_start_ok && 515 if (initrd_start && !initrd_below_start_ok &&
516 initrd_start < min_low_pfn << PAGE_SHIFT) { 516 initrd_start < min_low_pfn << PAGE_SHIFT) {