Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751670AbdGZRXJ (ORCPT ); Wed, 26 Jul 2017 13:23:09 -0400 Received: from terminus.zytor.com ([65.50.211.136]:49161 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751057AbdGZRXH (ORCPT ); Wed, 26 Jul 2017 13:23:07 -0400 Date: Wed, 26 Jul 2017 10:20:51 -0700 From: tip-bot for Taeung Song Message-ID: Cc: treeze.taeung@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, namhyung@kernel.org, milian.wolff@kdab.com, jolsa@redhat.com, tglx@linutronix.de Reply-To: hpa@zytor.com, mingo@kernel.org, milian.wolff@kdab.com, namhyung@kernel.org, jolsa@redhat.com, tglx@linutronix.de, treeze.taeung@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com In-Reply-To: <1500500215-16646-1-git-send-email-treeze.taeung@gmail.com> References: <1500500215-16646-1-git-send-email-treeze.taeung@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Do not overwrite sample->period Git-Commit-ID: ecd5f9959d2c9540482977ff1208ea67fbfb8cc9 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 Content-Length: 1447 Lines: 36 Commit-ID: ecd5f9959d2c9540482977ff1208ea67fbfb8cc9 Gitweb: http://git.kernel.org/tip/ecd5f9959d2c9540482977ff1208ea67fbfb8cc9 Author: Taeung Song AuthorDate: Fri, 21 Jul 2017 11:38:48 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 21 Jul 2017 12:02:52 -0300 perf annotate: Do not overwrite sample->period In fixing the --show-total-period option it was noticed that the value of sample->period was being overwritten, fix it. Signed-off-by: Taeung Song Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Fixes: fd36f3dd7933 ("perf hist: Pass struct sample to __hists__add_entry()") Link: http://lkml.kernel.org/r/1500500215-16646-1-git-send-email-treeze.taeung@gmail.com [ split from a larger patch, added the Fixes tag ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-annotate.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 96fe1a8..7e33278 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -177,7 +177,6 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel, */ process_branch_stack(sample->branch_stack, al, sample); - sample->period = 1; sample->weight = 1; he = hists__add_entry(hists, al, NULL, NULL, NULL, sample, true);