From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 Oct 2012 15:36:24 +0000 (-0700)
Subject: Revert dyndbg: fix for SOH in logging messages
X-Git-Tag: v3.5.7~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5a1a81c6a690de3e98e8894afa227d584929185;p=thirdparty%2Fkernel%2Fstable.git

Revert dyndbg: fix for SOH in logging messages

This reverts commit 3d822616ca81881d8c19d0b473e79ba241c700de, which is
ebdc82899ec5ed35af1c79ed6a4eeda69dad9b90 upstream, as it's not needed in
the 3.5.y tree.

Reported-by: Wouter M. Koolen <W.M.Koolen-Wijkstra@cwi.nl>
Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
Cc: 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>
---

diff --git a/drivers/base/core.c b/drivers/base/core.c
index c5981227fcc58..b18138a9a7109 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1895,8 +1895,8 @@ int __dev_printk(const char *level, const struct device *dev,
 				    "DEVICE=+%s:%s", subsys, dev_name(dev));
 	}
 skip:
-	if (level[2])
-		level_extra = &level[2]; /* skip past KERN_SOH "L" */
+	if (level[3])
+		level_extra = &level[3]; /* skip past "<L>" */
 
 	return printk_emit(0, level[1] - '0',
 			   dictlen ? dict : NULL, dictlen,