From 0ee218bac1923d88ac35128a2bdb36b332896f38 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Wed, 29 Jun 2011 23:52:52 +0200
Subject: [PATCH] --- yaml --- r: 257079 b: refs/heads/master c:
 cb1955b86c86782ff20037da42ef030057501c34 h: refs/heads/master i:   257077:
 8c21faf6c7b4167daffd3d0fec336ec21a61241b   257075:
 8389b3a87b34569ab47f7d0defaf784e35ad81c2   257071:
 b0adc8601a0e3411482a505aadc25b8ae0b2a4bf v: v3

---
 [refs]                            | 2 +-
 trunk/tools/perf/builtin-report.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6c5f4790b3fa..269dbc42e698 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd8ea21276adefc7f0133bd42fcf3b2faf0b15f8
+refs/heads/master: cb1955b86c86782ff20037da42ef030057501c34
diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c
index 271e252dc651..5d43d0181d63 100644
--- a/trunk/tools/perf/builtin-report.c
+++ b/trunk/tools/perf/builtin-report.c
@@ -525,7 +525,14 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
 	if (parent_pattern != default_parent_pattern) {
 		if (sort_dimension__add("parent") < 0)
 			return -1;
-		sort_parent.elide = 1;
+
+		/*
+		 * Only show the parent fields if we explicitly
+		 * sort that way. If we only use parent machinery
+		 * for filtering, we don't want it.
+		 */
+		if (!strstr(sort_order, "parent"))
+			sort_parent.elide = 1;
 	} else
 		symbol_conf.exclude_other = false;