]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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>
Tue, 2 Oct 2012 17:39:10 +0000 (10:39 -0700)
commit ebdc82899ec5ed35af1c79ed6a4eeda69dad9b90 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/core.c

index b18138a9a710993d5fd325efffc1f4e965939e87..c5981227fcc580d2bb758fabb33c21df6620b896 100644 (file)
@@ -1895,8 +1895,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,