printk/kdb: handle more message headers

Commit 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing
continuation lines") allows to define more message headers for a single
message.  The motivation is that continuous lines might get mixed.
Therefore it make sense to define the right log level for every piece of
a cont line.

This patch introduces printk_skip_headers() that will skip all headers
and uses it in the kdb code instead of printk_skip_level().

This approach helps to fix other printk_skip_level() users
independently.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Petr Mladek <[email protected]>
Cc: Joe Perches <[email protected]>
Cc: Sergey Senozhatsky <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Jason Wessel <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>
Cc: Chris Mason <[email protected]>
Cc: Josef Bacik <[email protected]>
Cc: David Sterba <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/include/linux/printk.h b/include/linux/printk.h
index eac1af8502bbffcf51ccfd31c59ce14830f6267f..a0859e169bc32260dc6cb0f76eb87e7698bd8ce0 100644 (file)
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -31,6 +31,14 @@ static inline const char *printk_skip_level(const char *buffer)
        return buffer;
 }
 
+static inline const char *printk_skip_headers(const char *buffer)
+{
+       while (printk_get_level(buffer))
+               buffer = printk_skip_level(buffer);
+
+       return buffer;
+}
+
 #define CONSOLE_EXT_LOG_MAX    8192
 
 /* printk's without a loglevel use this.. */

diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
index fc1ef736253c79954686d018a2deca4c86300fa6..98c9011eac7802e105c90064c5a5a670b8a53153 100644 (file)
--- a/kernel/debug/kdb/kdb_io.c
+++ b/kernel/debug/kdb/kdb_io.c
@@ -697,7 +697,7 @@ kdb_printit:
         * Write to all consoles.
         */
        retlen = strlen(kdb_buffer);
-       cp = (char *) printk_skip_level(kdb_buffer);
+       cp = (char *) printk_skip_headers(kdb_buffer);
        if (!dbg_kdb_mode && kgdb_connected) {
                gdbstub_msg_write(cp, retlen - (cp - kdb_buffer));
        } else {