Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Heiko Carstens and committed by
Linus Torvalds
93e02814 3e541a4a

+4 -4
+4 -4
init/main.c
··· 498 498 softirq_init(); 499 499 timekeeping_init(); 500 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 507 * HACK ALERT! This is early. We're enabling the console before ··· 511 507 console_init(); 512 508 if (panic_later) 513 509 panic(panic_later, panic_param); 514 - profile_init(); 515 - if (!irqs_disabled()) 516 - printk("start_kernel(): bug: interrupts were enabled early\n"); 517 - local_irq_enable(); 518 510 #ifdef CONFIG_BLK_DEV_INITRD 519 511 if (initrd_start && !initrd_below_start_ok && 520 512 initrd_start < min_low_pfn << PAGE_SHIFT) {