Commit ebdc8289 authored Aug 18, 2012 by Markus Trippelsdorf Committed by Greg Kroah-Hartman Aug 18, 2012

dyndbg: fix for SOH in logging messages



commit af7f2158 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>

parent 7b7e995d

drivers/base/core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,

Admin message