[tip:perf/core] perf tools: Do not auto-remove Children column if --fields given

[tip-bot for Namhyung Kim]

Commit-ID:  2bf1a12340bda1bf621f27b9892094a51b1297fd
Gitweb:     http://git.kernel.org/tip/2bf1a12340bda1bf621f27b9892094a51b1297fd
Author:     Namhyung Kim <namhyung@xxxxxxxxxx>
AuthorDate: Thu, 20 Mar 2014 09:10:29 +0900
Committer:  Jiri Olsa <jolsa@xxxxxxxxxx>
CommitDate: Sun, 1 Jun 2014 14:35:05 +0200

perf tools: Do not auto-remove Children column if --fields given

Depending on the configuration perf inserts/removes the Children
column in the output automatically.  But it might not be what user
wants if [s]he give --fields option explicitly.

Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Tested-by: Rodrigo Campos <rodrigo@xxxxxxxxxxx>
Cc: Arun Sharma <asharma@xxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1401335910-16832-18-git-send-email-namhyung@xxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
 tools/perf/ui/hist.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 8ca6387..498adb2 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -513,6 +513,9 @@ void perf_hpp__column_disable(unsigned col)
 
 void perf_hpp__cancel_cumulate(void)
 {
+	if (field_order)
+		return;
+
 	perf_hpp__column_disable(PERF_HPP__OVERHEAD_ACC);
 	perf_hpp__format[PERF_HPP__OVERHEAD].header = hpp__header_overhead;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/