From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755528AbcBCKM6 (ORCPT ); Wed, 3 Feb 2016 05:12:58 -0500 Received: from terminus.zytor.com ([198.137.202.10]:54488 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753578AbcBCKM4 (ORCPT ); Wed, 3 Feb 2016 05:12:56 -0500 Date: Wed, 3 Feb 2016 02:12:18 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: andi@firstfloor.org, peterz@infradead.org, dsahern@gmail.com, acme@redhat.com, eranian@google.com, tglx@linutronix.de, namhyung@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, wangnan0@huawei.com Reply-To: dsahern@gmail.com, peterz@infradead.org, andi@firstfloor.org, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, namhyung@kernel.org, tglx@linutronix.de, eranian@google.com, wangnan0@huawei.com, hpa@zytor.com In-Reply-To: <1452960197-5323-9-git-send-email-namhyung@kernel.org> References: <1452960197-5323-9-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Be a bit more strict about presenting CPU socket zoom Git-Commit-ID: d9695d9f93649ecc00877ec2c847739c54a4cbb3 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d9695d9f93649ecc00877ec2c847739c54a4cbb3 Gitweb: http://git.kernel.org/tip/d9695d9f93649ecc00877ec2c847739c54a4cbb3 Author: Namhyung Kim AuthorDate: Fri, 22 Jan 2016 12:20:18 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 26 Jan 2016 11:52:50 -0300 perf hists browser: Be a bit more strict about presenting CPU socket zoom For consistency with the other sort order checks. Signed-off-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa , Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/1452960197-5323-9-git-send-email-namhyung@kernel.org [ Carved out from a larger patch, moved check to add_socket_opt() ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index e892106..b919582 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -1971,7 +1971,7 @@ static int add_socket_opt(struct hist_browser *browser, struct popup_action *act, char **optstr, int socket_id) { - if (socket_id < 0) + if (!sort__has_socket || socket_id < 0) return 0; if (asprintf(optstr, "Zoom %s Processor Socket %d",