]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.5-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Oct 2012 15:38:48 +0000 (08:38 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Oct 2012 15:38:48 +0000 (08:38 -0700)
added patches:

queue-3.5/revert-dyndbg-fix-for-soh-in-logging-messages.patch [new file with mode: 0644]
queue-3.5/series [new file with mode: 0644]

diff --git a/queue-3.5/revert-dyndbg-fix-for-soh-in-logging-messages.patch b/queue-3.5/revert-dyndbg-fix-for-soh-in-logging-messages.patch
new file mode 100644 (file)
index 0000000..0724ff4
--- /dev/null
@@ -0,0 +1,36 @@
+From foo@baz Mon Oct  8 08:36:24 PDT 2012
+Date: Mon, 08 Oct 2012 08:36:24 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: 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>
+
+
+---
+ 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,
diff --git a/queue-3.5/series b/queue-3.5/series
new file mode 100644 (file)
index 0000000..09c083c
--- /dev/null
@@ -0,0 +1 @@
+revert-dyndbg-fix-for-soh-in-logging-messages.patch