Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:24:02 +0100
commitfa4016be73ce7455115eb8f7c166c294f05e5354 (patch)
tree893151584b21b767bf0a2734edc75e4da90d7779
parentbecfbc0f4fb6048e318ac0a272f7d066f948c7d5 (diff)
tracing: uprobes: Fix typo in pr_fmt string (bnc#1012628).
-rw-r--r--patches.kernel.org/4.20.9-022-tracing-uprobes-Fix-typo-in-pr_fmt-string.patch43
-rw-r--r--series.conf1
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-022-tracing-uprobes-Fix-typo-in-pr_fmt-string.patch b/patches.kernel.org/4.20.9-022-tracing-uprobes-Fix-typo-in-pr_fmt-string.patch
new file mode 100644
index 0000000000..2e1340f22a
--- /dev/null
+++ b/patches.kernel.org/4.20.9-022-tracing-uprobes-Fix-typo-in-pr_fmt-string.patch
@@ -0,0 +1,43 @@
+From: Andreas Ziegler <andreas.ziegler@fau.de>
+Date: Thu, 17 Jan 2019 14:30:23 +0100
+Subject: [PATCH] tracing: uprobes: Fix typo in pr_fmt string
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: ea6eb5e7d15e1838de335609994b4546e2abcaaf
+
+commit ea6eb5e7d15e1838de335609994b4546e2abcaaf upstream.
+
+The subsystem-specific message prefix for uprobes was also
+"trace_kprobe: " instead of "trace_uprobe: " as described in
+the original commit message.
+
+Link: http://lkml.kernel.org/r/20190117133023.19292-1-andreas.ziegler@fau.de
+
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: stable@vger.kernel.org
+Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
+Fixes: 7257634135c24 ("tracing/probe: Show subsystem name in messages")
+Signed-off-by: Andreas Ziegler <andreas.ziegler@fau.de>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ kernel/trace/trace_uprobe.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
+index f4d2252e087b..ec8332c5056a 100644
+--- a/kernel/trace/trace_uprobe.c
++++ b/kernel/trace/trace_uprobe.c
+@@ -5,7 +5,7 @@
+ * Copyright (C) IBM Corporation, 2010-2012
+ * Author: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
+ */
+-#define pr_fmt(fmt) "trace_kprobe: " fmt
++#define pr_fmt(fmt) "trace_uprobe: " fmt
+
+ #include <linux/module.h>
+ #include <linux/uaccess.h>
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 5066595872..7fa4dbf0b4 100644
--- a/series.conf
+++ b/series.conf
@@ -1104,6 +1104,7 @@
patches.kernel.org/4.20.9-019-pinctrl-sunxi-Correct-number-of-IRQ-banks-on-H.patch
patches.kernel.org/4.20.9-020-pinctrl-cherryview-fix-Strago-DMI-workaround.patch
patches.kernel.org/4.20.9-021-tracing-uprobes-Fix-output-for-multiple-string.patch
+ patches.kernel.org/4.20.9-022-tracing-uprobes-Fix-typo-in-pr_fmt-string.patch
########################################################
# Build fixes that apply to the vanilla kernel too.