From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752585AbcFZK4q (ORCPT ); Sun, 26 Jun 2016 06:56:46 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51212 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752236AbcFZK4o (ORCPT ); Sun, 26 Jun 2016 06:56:44 -0400 Date: Sun, 26 Jun 2016 03:56:09 -0700 From: tip-bot for He Kuang Message-ID: Cc: wangnan0@huawei.com, mingo@kernel.org, mhiramat@kernel.org, kan.liang@intel.com, ak@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, jolsa@kernel.org, peterz@infradead.org, sukadev@linux.vnet.ibm.com, eranian@google.com, jpoimboe@redhat.com, tumanova@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org, dsahern@gmail.com, hekuang@huawei.com, acme@redhat.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, penberg@kernel.org Reply-To: mingo@kernel.org, wangnan0@huawei.com, mhiramat@kernel.org, kan.liang@intel.com, tglx@linutronix.de, ak@linux.intel.com, hpa@zytor.com, jolsa@kernel.org, peterz@infradead.org, jpoimboe@redhat.com, eranian@google.com, sukadev@linux.vnet.ibm.com, dsahern@gmail.com, namhyung@kernel.org, tumanova@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, acme@redhat.com, hekuang@huawei.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, penberg@kernel.org In-Reply-To: <1466578626-92406-2-git-send-email-hekuang@huawei.com> References: <1466578626-92406-2-git-send-email-hekuang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf unwind: Change macro names of perf register Git-Commit-ID: 78ff1d6d8bf6bb3ee2b3781bbd88355a322435a4 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: 78ff1d6d8bf6bb3ee2b3781bbd88355a322435a4 Gitweb: http://git.kernel.org/tip/78ff1d6d8bf6bb3ee2b3781bbd88355a322435a4 Author: He Kuang AuthorDate: Wed, 22 Jun 2016 06:57:02 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 23 Jun 2016 10:30:17 -0300 perf unwind: Change macro names of perf register Use macro name prefixed with "LIBUNWIND_ARCH" for better understanding that the regs used by callbacks of libunwind are arch specific. The real regs used should be defined in the wrapper file of "unwind-libunwind-local.c" for each supported arch. Signed-off-by: He Kuang Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: David Ahern Cc: Ekaterina Tumanova Cc: Josh Poimboeuf Cc: Kan Liang Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Pekka Enberg Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Sukadev Bhattiprolu Cc: Wang Nan Link: http://lkml.kernel.org/r/1466578626-92406-2-git-send-email-hekuang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/unwind-libunwind-local.c | 6 ++++-- tools/perf/util/unwind.h | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c index 01c2e86..97c0f8f 100644 --- a/tools/perf/util/unwind-libunwind-local.c +++ b/tools/perf/util/unwind-libunwind-local.c @@ -462,7 +462,8 @@ static int access_mem(unw_addr_space_t __maybe_unused as, return 0; } - ret = perf_reg_value(&start, &ui->sample->user_regs, PERF_REG_SP); + ret = perf_reg_value(&start, &ui->sample->user_regs, + LIBUNWIND__ARCH_REG_SP); if (ret) return ret; @@ -621,7 +622,8 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb, unw_cursor_t c; int ret, i = 0; - ret = perf_reg_value(&val, &ui->sample->user_regs, PERF_REG_IP); + ret = perf_reg_value(&val, &ui->sample->user_regs, + LIBUNWIND__ARCH_REG_IP); if (ret) return ret; diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h index b074662..84c6d44 100644 --- a/tools/perf/util/unwind.h +++ b/tools/perf/util/unwind.h @@ -32,6 +32,15 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, #ifndef LIBUNWIND__ARCH_REG_ID #define LIBUNWIND__ARCH_REG_ID(regnum) libunwind__arch_reg_id(regnum) #endif + +#ifndef LIBUNWIND__ARCH_REG_SP +#define LIBUNWIND__ARCH_REG_SP PERF_REG_SP +#endif + +#ifndef LIBUNWIND__ARCH_REG_IP +#define LIBUNWIND__ARCH_REG_IP PERF_REG_IP +#endif + int LIBUNWIND__ARCH_REG_ID(int regnum); int unwind__prepare_access(struct thread *thread, struct map *map); void unwind__flush_access(struct thread *thread);