From patchwork Mon Jan 4 23:23:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 562835 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id D446C1401CA; Tue, 5 Jan 2016 10:27:23 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1aGEX0-0002Ec-EX; Mon, 04 Jan 2016 23:27:18 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1aGETZ-0000Ab-Ft for kernel-team@lists.ubuntu.com; Mon, 04 Jan 2016 23:23:45 +0000 Received: from 1.general.kamal.us.vpn ([10.172.68.52] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1aGETY-0006QK-PH; Mon, 04 Jan 2016 23:23:45 +0000 Received: from kamal by fourier with local (Exim 4.82) (envelope-from ) id 1aGETW-0007NF-1c; Mon, 04 Jan 2016 15:23:42 -0800 From: Kamal Mostafa To: Namhyung Kim Subject: [4.2.y-ckt stable] Patch "perf annotate: Fix 'annotate.use_offset' config variable usage" has been added to staging queue Date: Mon, 4 Jan 2016 15:23:40 -0800 Message-Id: <1451949821-28315-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 X-Extended-Stable: 4.2 MIME-Version: 1.0 Cc: Peter Zijlstra , Jiri Olsa , Kamal Mostafa , Arnaldo Carvalho de Melo , kernel-team@lists.ubuntu.com, Taeung Song , David Ahern , =?UTF-8?q?Martin=20Li=C5=A1ka?= X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled perf annotate: Fix 'annotate.use_offset' config variable usage to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-4.2.y-queue This patch is scheduled to be released in version 4.2.8-ckt1. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 4.2.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ From 16a542a1ffabc9deb6671085d3555da3f29d94d8 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Wed, 21 Oct 2015 11:57:20 +0900 Subject: perf annotate: Fix 'annotate.use_offset' config variable usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 39ff7cdb5a5e6b75dd049255615828c6531cd109 upstream. 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 Signed-off-by: Kamal Mostafa --- tools/perf/ui/browsers/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index 5995a8b..ebca255 100644 --- a/tools/perf/ui/browsers/annotate.c +++ b/tools/perf/ui/browsers/annotate.c @@ -1030,8 +1030,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