From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752708AbbJWIci (ORCPT ); Fri, 23 Oct 2015 04:32:38 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55673 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751754AbbJWIcf (ORCPT ); Fri, 23 Oct 2015 04:32:35 -0400 Date: Fri, 23 Oct 2015 01:32:14 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: a.p.zijlstra@chello.nl, mliska@suse.cz, jolsa@redhat.com, namhyung@kernel.org, treeze.taeung@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, dsahern@gmail.com Reply-To: tglx@linutronix.de, dsahern@gmail.com, acme@redhat.com, mingo@kernel.org, a.p.zijlstra@chello.nl, mliska@suse.cz, treeze.taeung@gmail.com, hpa@zytor.com, namhyung@kernel.org, jolsa@redhat.com, linux-kernel@vger.kernel.org In-Reply-To: <1445396240-3428-1-git-send-email-namhyung@kernel.org> References: <1445396240-3428-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Fix 'annotate.use_offset' config variable usage Git-Commit-ID: 39ff7cdb5a5e6b75dd049255615828c6531cd109 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: 39ff7cdb5a5e6b75dd049255615828c6531cd109 Gitweb: http://git.kernel.org/tip/39ff7cdb5a5e6b75dd049255615828c6531cd109 Author: Namhyung Kim AuthorDate: Wed, 21 Oct 2015 11:57:20 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 22 Oct 2015 16:34:29 -0300 perf annotate: Fix 'annotate.use_offset' config variable usage The annotate__configs should be sorted so that it can use bsearch(3). However commit 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period") added a new config item at the end. This resulted in the 'annotate.use_offset' config variable cannot be found and perf terminated like below: $ perf report bad config file line 6 in ~/.perfconfig Signed-off-by: Namhyung Kim Cc: David Ahern Cc: Jiri Olsa Cc: Martin Liška Cc: Peter Zijlstra Cc: Taeung Song Fixes: 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period") Link: http://lkml.kernel.org/r/1445396240-3428-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index bec0b62..ba72e01 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -1125,8 +1125,8 @@ static struct annotate_config { ANNOTATE_CFG(jump_arrows), ANNOTATE_CFG(show_linenr), ANNOTATE_CFG(show_nr_jumps), - ANNOTATE_CFG(use_offset), ANNOTATE_CFG(show_total_period), + ANNOTATE_CFG(use_offset), }; #undef ANNOTATE_CFG