diff --git a/[refs] b/[refs] index 3d1ea31f7ffe..2633d31f57b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e541a4ae534a7e59ad464af9abea382b3035724 +refs/heads/master: 93e028148fce0be9787de7fb097fa4c8582b78c1 diff --git a/trunk/init/main.c b/trunk/init/main.c index c8960b9df623..d604dfef82b8 100644 --- a/trunk/init/main.c +++ b/trunk/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) {