mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-09-22 12:42:50 +00:00
[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>
This commit is contained in:
parent
3e541a4ae5
commit
93e028148f
1 changed files with 4 additions and 4 deletions
|
@ -498,6 +498,10 @@ asmlinkage void __init start_kernel(void)
|
||||||
softirq_init();
|
softirq_init();
|
||||||
timekeeping_init();
|
timekeeping_init();
|
||||||
time_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
|
* HACK ALERT! This is early. We're enabling the console before
|
||||||
|
@ -507,10 +511,6 @@ asmlinkage void __init start_kernel(void)
|
||||||
console_init();
|
console_init();
|
||||||
if (panic_later)
|
if (panic_later)
|
||||||
panic(panic_later, panic_param);
|
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
|
#ifdef CONFIG_BLK_DEV_INITRD
|
||||||
if (initrd_start && !initrd_below_start_ok &&
|
if (initrd_start && !initrd_below_start_ok &&
|
||||||
initrd_start < min_low_pfn << PAGE_SHIFT) {
|
initrd_start < min_low_pfn << PAGE_SHIFT) {
|
||||||
|
|
Loading…
Reference in a new issue