Skip to content

Commit

Permalink
dyndbg: fix for SOH in logging messages
Browse files Browse the repository at this point in the history
commit af7f215 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>
  • Loading branch information
Markus Trippelsdorf authored and Greg Kroah-Hartman committed Aug 19, 2012
1 parent 7b7e995 commit ebdc828
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/base/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit ebdc828

Please sign in to comment.