Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index ea73e1eb361c600a8970665606b43f399c78f85a..ceed17aaedfd8393d0a2dabc7849cd2871a4f38d 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -386,7 +386,7 @@ static noinline void __init_refok rest_init(void)
        init_idle_bootup_task(current);
        schedule_preempt_disabled();
        /* Call into cpu_idle with preempt disabled */
-       cpu_idle();
+       cpu_startup_entry(CPUHP_ONLINE);
 }
 
 /* Check for early params. */
@@ -495,7 +495,6 @@ asmlinkage void __init start_kernel(void)
  * Interrupts are still disabled. Do necessary setups, then
  * enable them
  */
-       tick_init();
        boot_cpu_init();
        page_address_init();
        pr_notice("%s", linux_banner);
@@ -549,6 +548,7 @@ asmlinkage void __init start_kernel(void)
        /* init some links before init_ISA_irqs() */
        early_irq_init();
        init_IRQ();
+       tick_init();
        init_timers();
        hrtimers_init();
        softirq_init();
@@ -686,11 +686,8 @@ int __init_or_module do_one_initcall(initcall_t fn)
 
        msgbuf[0] = 0;
 
-       if (ret && ret != -ENODEV && initcall_debug)
-               sprintf(msgbuf, "error code %d ", ret);
-
        if (preempt_count() != count) {
-               strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
+               sprintf(msgbuf, "preemption imbalance ");
                preempt_count() = count;
        }
        if (irqs_disabled()) {