From fd4798c031db0cbedd38e52f5e4d1c05c2623077 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 6 Jan 2010 17:27:11 -0500 Subject: [PATCH] --- yaml --- r: 182293 b: refs/heads/master c: d931369b74b3d6f2044f595af6f3dd074f65d9cf h: refs/heads/master i: 182291: 4ad66219495b0345af1f073dee4900096b6bae4f v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 10b93757c660..707c9a3676c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfaa9e2c5707b2c217c0121aac796e0fa3051482 +refs/heads/master: d931369b74b3d6f2044f595af6f3dd074f65d9cf diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index abdd333a0825..5314c90bbc83 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -1392,8 +1392,10 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args) entry->fmt = fmt; memcpy(entry->buf, trace_buf, sizeof(u32) * len); - if (!filter_check_discard(call, entry, buffer, event)) + if (!filter_check_discard(call, entry, buffer, event)) { ring_buffer_unlock_commit(buffer, event); + ftrace_trace_stack(buffer, flags, 6, pc); + } out_unlock: arch_spin_unlock(&trace_buf_lock); @@ -1466,8 +1468,10 @@ int trace_array_vprintk(struct trace_array *tr, memcpy(&entry->buf, trace_buf, len); entry->buf[len] = '\0'; - if (!filter_check_discard(call, entry, buffer, event)) + if (!filter_check_discard(call, entry, buffer, event)) { ring_buffer_unlock_commit(buffer, event); + ftrace_trace_stack(buffer, irq_flags, 6, pc); + } out_unlock: arch_spin_unlock(&trace_buf_lock);