From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946273AbdKRI3K (ORCPT ); Sat, 18 Nov 2017 03:29:10 -0500 Received: from terminus.zytor.com ([65.50.211.136]:42047 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163304AbdKRI3C (ORCPT ); Sat, 18 Nov 2017 03:29:02 -0500 Date: Sat, 18 Nov 2017 00:26:45 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dsahern@gmail.com, tmricht@linux.vnet.ibm.com, namhyung@kernel.org, jolsa@kernel.org, andi@firstfloor.org, acme@redhat.com, brueckner@linux.vnet.ibm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, adrian.hunter@intel.com, mingo@kernel.org, wangnan0@huawei.com Reply-To: wangnan0@huawei.com, mingo@kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, brueckner@linux.vnet.ibm.com, acme@redhat.com, andi@firstfloor.org, jolsa@kernel.org, tmricht@linux.vnet.ibm.com, namhyung@kernel.org, dsahern@gmail.com In-Reply-To: <20171109150046.GN4333@kernel.org> References: <20171109150046.GN4333@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv Git-Commit-ID: 82806c3aae7496d6974429f3bd43ebeeef18b9b2 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: 82806c3aae7496d6974429f3bd43ebeeef18b9b2 Gitweb: https://git.kernel.org/tip/82806c3aae7496d6974429f3bd43ebeeef18b9b2 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 9 Nov 2017 12:03:40 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 16 Nov 2017 14:49:53 -0300 perf evsel: Fix up leftover perf_evsel_stat usage via evsel->priv I forgot one conversion, which got noticed by Thomas when running: $ perf stat -e '{cpu-clock,instructions}' kill kill: not enough arguments Segmentation fault (core dumped) $ Fix it, those stats are in evsel->stats, not anymore in evsel->priv. Reported-by: Thomas-Mich Richter Tested-by: Thomas-Mich Richter Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Hendrik Brueckner Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Fixes: e669e833da8d ("perf evsel: Restore evsel->priv as a tool private area") Link: http://lkml.kernel.org/r/20171109150046.GN4333@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 4376cdf..cb9bcdb 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1377,7 +1377,7 @@ perf_evsel__process_group_data(struct perf_evsel *leader, static int perf_evsel__read_group(struct perf_evsel *leader, int cpu, int thread) { - struct perf_stat_evsel *ps = leader->priv; + struct perf_stat_evsel *ps = leader->stats; u64 read_format = leader->attr.read_format; int size = perf_evsel__read_size(leader); u64 *data = ps->group_data;