From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755714Ab1FCOUN (ORCPT ); Fri, 3 Jun 2011 10:20:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46259 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755682Ab1FCOUL (ORCPT ); Fri, 3 Jun 2011 10:20:11 -0400 From: Jiri Olsa To: rostedt@goodmis.org, fweisbec@gmail.com, mingo@redhat.com Cc: linux-kernel@vger.kernel.org, Jiri Olsa Subject: [PATCH 3/5] tracing, function: Fix trace header to follow context-info option Date: Fri, 3 Jun 2011 16:20:01 +0200 Message-Id: <1307110803-9476-4-git-send-email-jolsa@redhat.com> In-Reply-To: <1307110803-9476-1-git-send-email-jolsa@redhat.com> References: <1307110803-9476-1-git-send-email-jolsa@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The header display of function tracer does not follow the context-info option, so field names are displayed even if this option is off. Added check for TRACE_ITER_CONTEXT_INFO trace_flags. Signed-off-by: Jiri Olsa --- kernel/trace/trace.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index ee9c921..01fc8d7 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2051,6 +2051,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)) -- 1.7.1