From 1a814c56306f2df067618077e42f0a24eb4fb9bc Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@redhat.com>
Date: Fri, 3 Jun 2011 16:58:49 +0200
Subject: [PATCH] --- yaml --- r: 257104 b: refs/heads/master c:
 f56e7f8efb4ec200364f690a9902713410e24d47 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 10094ec97710..b7964493cc15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffeb80fc30acbf6bd51cb47a1815f621a9d017dc
+refs/heads/master: f56e7f8efb4ec200364f690a9902713410e24d47
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 42fdf3adff31..cf22b4bf9896 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -2053,6 +2053,9 @@ void trace_default_header(struct seq_file *m)
 {
 	struct trace_iterator *iter = m->private;
 
+	if (!(trace_flags & TRACE_ITER_CONTEXT_INFO))
+		return;
+
 	if (iter->iter_flags & TRACE_FILE_LAT_FMT) {
 		/* print nothing if the buffers are empty */
 		if (trace_empty(iter))