This is a note to let you know that I've just added the patch titled
tracing: Add TRACE_ITER_PRINTK flag check in __trace_puts/__trace_bputs
to the 3.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tracing-add-trace_iter_printk-flag-check-in-__trace_puts-__trace_bputs.patch
and it can be found in the queue-3.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From f0160a5a2912267c02cfe692eac955c360de5fdf Mon Sep 17 00:00:00 2001
From: "zhangwei(Jovi)" <[email protected]>
Date: Thu, 18 Jul 2013 16:31:18 +0800
Subject: tracing: Add TRACE_ITER_PRINTK flag check in __trace_puts/__trace_bputs
From: "zhangwei(Jovi)" <[email protected]>
commit f0160a5a2912267c02cfe692eac955c360de5fdf upstream.
The TRACE_ITER_PRINTK check in __trace_puts/__trace_bputs is missing,
so add it, to be consistent with __trace_printk/__trace_bprintk.
Those functions are all called by the same function: trace_printk().
Link: http://lkml.kernel.org/p/[email protected]
Signed-off-by: zhangwei(Jovi) <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
kernel/trace/trace.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -468,6 +468,9 @@ int __trace_puts(unsigned long ip, const
int alloc;
int pc;
+ if (!(trace_flags & TRACE_ITER_PRINTK))
+ return 0;
+
pc = preempt_count();
if (unlikely(tracing_selftest_running || tracing_disabled))
@@ -515,6 +518,9 @@ int __trace_bputs(unsigned long ip, cons
int size = sizeof(struct bputs_entry);
int pc;
+ if (!(trace_flags & TRACE_ITER_PRINTK))
+ return 0;
+
pc = preempt_count();
if (unlikely(tracing_selftest_running || tracing_disabled))
Patches currently in stable-queue which might be from [email protected]
are
queue-3.15/tracing-add-trace_iter_printk-flag-check-in-__trace_puts-__trace_bputs.patch
queue-3.15/tracing-add-ftrace_trace_stack-into-__trace_puts-__trace_bputs.patch
queue-3.15/tracing-instance_rmdir-leaks-ftrace_event_file-filter.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
