3.5-stable review patch.  If anyone has any objections, please let me know.

------------------

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-wijks...@cwi.nl>
Cc: Markus Trippelsdorf <mar...@trippelsdorf.de>
Cc: Jim Cromie <jim.cro...@gmail.com>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Jason Baron <jba...@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>


---
 drivers/base/core.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1895,8 +1895,8 @@ int __dev_printk(const char *level, cons
                                    "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,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to