From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752188AbdK2GcF (ORCPT ); Wed, 29 Nov 2017 01:32:05 -0500 Received: from terminus.zytor.com ([65.50.211.136]:51317 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752014AbdK2Gb7 (ORCPT ); Wed, 29 Nov 2017 01:31:59 -0500 Date: Tue, 28 Nov 2017 22:29:22 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: linux-kernel@vger.kernel.org, adrian.hunter@intel.com, acme@redhat.com, wangnan0@huawei.com, tmricht@linux.vnet.ibm.com, andi@firstfloor.org, namhyung@kernel.org, jolsa@kernel.org, brueckner@linux.vnet.ibm.com, dsahern@gmail.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org Reply-To: namhyung@kernel.org, tmricht@linux.vnet.ibm.com, andi@firstfloor.org, dsahern@gmail.com, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, jolsa@kernel.org, brueckner@linux.vnet.ibm.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, acme@redhat.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: 8e2d8e204247aa9eeb87893f6b8bf0cf29428b31 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: 8e2d8e204247aa9eeb87893f6b8bf0cf29428b31 Gitweb: https://git.kernel.org/tip/8e2d8e204247aa9eeb87893f6b8bf0cf29428b31 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 9 Nov 2017 12:03:40 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 Nov 2017 14:20:32 -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 bfde6a7..d5fbcf8 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1375,7 +1375,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;