init: don't lose initcall return values
authorCyrill Gorcunov <gorcunov@gmail.com>
Mon, 12 May 2008 21:02:22 +0000 (14:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 May 2008 15:02:25 +0000 (08:02 -0700)
There is an ability to lose an initcall return value if it happened with irq
disabled or imbalanced preemption (and if we debug initcall).

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
init/main.c

index ddada7a..f406fef 100644 (file)
@@ -702,7 +702,6 @@ static void __init do_initcalls(void)
 
        for (call = __initcall_start; call < __initcall_end; call++) {
                ktime_t t0, t1, delta;
-               char *msg = NULL;
                char msgbuf[40];
                int result;
 
@@ -724,22 +723,23 @@ static void __init do_initcalls(void)
                                (unsigned long long) delta.tv64 >> 20);
                }
 
-               if (result && result != -ENODEV && initcall_debug) {
-                       sprintf(msgbuf, "error code %d", result);
-                       msg = msgbuf;
-               }
+               msgbuf[0] = 0;
+
+               if (result && result != -ENODEV && initcall_debug)
+                       sprintf(msgbuf, "error code %d ", result);
+
                if (preempt_count() != count) {
-                       msg = "preemption imbalance";
+                       strncat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
                        preempt_count() = count;
                }
                if (irqs_disabled()) {
-                       msg = "disabled interrupts";
+                       strncat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
                        local_irq_enable();
                }
-               if (msg) {
+               if (msgbuf[0]) {
                        print_fn_descriptor_symbol(KERN_WARNING "initcall %s()",
                                        (unsigned long) *call);
-                       printk(" returned with %s\n", msg);
+                       printk(" returned with %s\n", msgbuf);
                }
        }