From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754002AbdG3JmD (ORCPT ); Sun, 30 Jul 2017 05:42:03 -0400 Received: from terminus.zytor.com ([65.50.211.136]:38031 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753928AbdG3JmC (ORCPT ); Sun, 30 Jul 2017 05:42:02 -0400 Date: Sun, 30 Jul 2017 02:39:24 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, acme@redhat.com, namhyung@kernel.org, dsahern@gmail.com, treeze.taeung@gmail.com, adrian.hunter@intel.com, jolsa@kernel.org, mingo@kernel.org, wangnan0@huawei.com, andi@firstfloor.org, milian.wolff@kdab.com, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: tglx@linutronix.de, milian.wolff@kdab.com, linux-kernel@vger.kernel.org, mingo@kernel.org, wangnan0@huawei.com, andi@firstfloor.org, namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, treeze.taeung@gmail.com, dsahern@gmail.com, hpa@zytor.com, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Do not overwrite perf_sample->weight Git-Commit-ID: c6c13be76c1fc8a3169dbd29cd1d42af1d64773f 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: c6c13be76c1fc8a3169dbd29cd1d42af1d64773f Gitweb: http://git.kernel.org/tip/c6c13be76c1fc8a3169dbd29cd1d42af1d64773f Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 26 Jul 2017 16:52:25 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 26 Jul 2017 16:52:25 -0300 perf annotate: Do not overwrite perf_sample->weight When we parse an event we may get a value from the kernel in response to PERF_SAMPLE_WEIGHT being set in perf_event_attr->sample_type, and if it is not set, then perf_sample->weight will be set to zero, which should be ok according to a discussion with Andi Kleen [1]: 1: https://lkml.kernel.org/r/20170724174637.GS3044@two.firstfloor.org Acked-by: Andi Kleen Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Taeung Song Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-8ev8ufk3lzmvgz37yg9nv3qz@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-annotate.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 6db782d..658c920 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -177,8 +177,6 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel, */ process_branch_stack(sample->branch_stack, al, sample); - sample->weight = 1; - he = hists__add_entry(hists, al, NULL, NULL, NULL, sample, true); if (he == NULL) return -ENOMEM;