[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>

1 files changed, 4 insertions, 4 deletions

diff --git a/init/main.c b/init/main.c
index c8960b9df62..d604dfef82b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -498,6 +498,10 @@ asmlinkage void __init start_kernel(void)
         softirq_init();
         timekeeping_init();
         time_init();
+        profile_init();
+        if (!irqs_disabled())
+                printk("start_kernel(): bug: interrupts were enabled early\n");
+        local_irq_enable();
 
         /*
          * HACK ALERT! This is early. We're enabling the console before
@@ -507,10 +511,6 @@ asmlinkage void __init start_kernel(void)
         console_init();
         if (panic_later)
                 panic(panic_later, panic_param);
-        profile_init();
-        if (!irqs_disabled())
-                printk("start_kernel(): bug: interrupts were enabled early\n");
-        local_irq_enable();
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start && !initrd_below_start_ok &&
                         initrd_start < min_low_pfn << PAGE_SHIFT) {