Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index d6b1c48a2baadd8a65760a4c7fcc48c94ae58f06..86c8f00befd1285d813d6819c64801075569913f 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -623,7 +623,7 @@ static int acquire_console_semaphore_for_printk(unsigned int cpu)
 static const char recursion_bug_msg [] =
                KERN_CRIT "BUG: recent printk recursion!\n";
 static int recursion_bug;
-       static int new_text_line = 1;
+static int new_text_line = 1;
 static char printk_buf[1024];
 
 asmlinkage int vprintk(const char *fmt, va_list args)
@@ -666,7 +666,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
        if (recursion_bug) {
                recursion_bug = 0;
                strcpy(printk_buf, recursion_bug_msg);
-               printed_len = sizeof(recursion_bug_msg);
+               printed_len = strlen(recursion_bug_msg);
        }
        /* Emit the output into the temporary buffer */
        printed_len += vscnprintf(printk_buf + printed_len,