lkml.org 
[lkml]   [2014]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.15 018/109] tracing: Add TRACE_ITER_PRINTK flag check in __trace_puts/__trace_bputs
    Date
    3.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: "zhangwei(Jovi)" <jovi.zhangwei@huawei.com>

    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/51E7A7D6.8090900@huawei.com

    Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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))



    \
     
     \ /
      Last update: 2014-07-27 01:01    [W:4.678 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site