From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163367AbdKRImI (ORCPT ); Sat, 18 Nov 2017 03:42:08 -0500 Received: from terminus.zytor.com ([65.50.211.136]:40711 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163352AbdKRIl6 (ORCPT ); Sat, 18 Nov 2017 03:41:58 -0500 Date: Sat, 18 Nov 2017 00:39:46 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: namhyung@kernel.org, dsahern@gmail.com, jolsa@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com, adrian.hunter@intel.com Reply-To: adrian.hunter@intel.com, acme@redhat.com, tglx@linutronix.de, mingo@kernel.org, wangnan0@huawei.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, dsahern@gmail.com, namhyung@kernel.org, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf callchain: Reset cursor arg instead of callchain_cursor Git-Commit-ID: 914eb9ca51117776d83e6761a1c555fb76f0ded2 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: 914eb9ca51117776d83e6761a1c555fb76f0ded2 Gitweb: https://git.kernel.org/tip/914eb9ca51117776d83e6761a1c555fb76f0ded2 Author: Jiri Olsa AuthorDate: Sun, 6 Aug 2017 16:39:39 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 16 Nov 2017 14:50:08 -0300 perf callchain: Reset cursor arg instead of callchain_cursor We already pass cursor into thread__resolve_callchain function, so there's no point in resetting the global instance. Signed-off-by: Jiri Olsa Cc: Adrian Hunter Cc: David Ahern Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-puk015qvuppao9m1xtdy9v7j@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 270f322..64d255f 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -2204,7 +2204,7 @@ int thread__resolve_callchain(struct thread *thread, { int ret = 0; - callchain_cursor_reset(&callchain_cursor); + callchain_cursor_reset(cursor); if (callchain_param.order == ORDER_CALLEE) { ret = thread__resolve_callchain_sample(thread, cursor,