dyndbg: fix for SOH in logging messages
authorMarkus Trippelsdorf <markus@trippelsdorf.de>
Sun, 19 Aug 2012 00:35:51 +0000 (18:35 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 19 Aug 2012 06:40:13 +0000 (23:40 -0700)
commit af7f2158fde was done against master, and clashed with structured
logging's change of KERN_LEVEL to SOH.

Bisected and fixed by Markus Trippelsdorf.

Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jason Baron <jbaron@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/core.c

index cdd01c52c629a61d8a2b4632b9115147595dbb44..5e6e00bc1652a064530818e5f87416604eba7e25 100644 (file)
@@ -1912,8 +1912,8 @@ int __dev_printk(const char *level, const struct device *dev,
                                    "DEVICE=+%s:%s", subsys, dev_name(dev));
        }
 skip:
-       if (level[3])
-               level_extra = &level[3]; /* skip past "<L>" */
+       if (level[2])
+               level_extra = &level[2]; /* skip past KERN_SOH "L" */
 
        return printk_emit(0, level[1] - '0',
                           dictlen ? dict : NULL, dictlen,