Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:58734 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932349AbcEBXbc (ORCPT ); Mon, 2 May 2016 19:31:32 -0400 Subject: Patch "perf hists: Fix determination of a callchain node's childlessness" has been added to the 4.5-stable tree To: andres@anarazel.de, a.p.zijlstra@chello.nl, acme@redhat.com, gregkh@linuxfoundation.org, namhyung@kernel.org Cc: , From: Date: Mon, 02 May 2016 16:31:30 -0700 Message-ID: <1462231890172202@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled perf hists: Fix determination of a callchain node's childlessness to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: perf-hists-fix-determination-of-a-callchain-node-s-childlessness.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From 909890355507e92bdaf648e73870f6b5df606da8 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Wed, 30 Mar 2016 21:02:45 +0200 Subject: perf hists: Fix determination of a callchain node's childlessness From: Andres Freund commit 909890355507e92bdaf648e73870f6b5df606da8 upstream. The 4b3a3212233a ("perf hists browser: Support flat callchains") commit over-aggressively tried to optimize callchain_node__init_have_children(). That lead to --tui mode not allowing to expand call chain elements if a call chain element had only one parent. That's why --inverted callgraphs looked halfway sane, but plain ones didn't. Revert that individual optimization, it wasn't really related to the rest of the commit. Signed-off-by: Andres Freund Acked-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Fixes: 4b3a3212233a ("perf hists browser: Support flat callchains") Link: http://lkml.kernel.org/r/20160330190245.GB13305@awork2.anarazel.de Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/ui/browsers/hists.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -302,7 +302,7 @@ static void callchain_node__init_have_ch chain = list_entry(node->val.next, struct callchain_list, list); chain->has_children = has_sibling; - if (node->val.next != node->val.prev) { + if (!list_empty(&node->val)) { chain = list_entry(node->val.prev, struct callchain_list, list); chain->has_children = !RB_EMPTY_ROOT(&node->rb_root); } Patches currently in stable-queue which might be from andres@anarazel.de are queue-4.5/perf-hists-fix-determination-of-a-callchain-node-s-childlessness.patch