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 bea1287aecdc6bf7c8ca97573e153a22012029bd..ceed17aaedfd8393d0a2dabc7849cd2871a4f38d 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -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()) {