From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423295AbcFHIv1 (ORCPT ); Wed, 8 Jun 2016 04:51:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54622 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422835AbcFHIvX (ORCPT ); Wed, 8 Jun 2016 04:51:23 -0400 Date: Wed, 8 Jun 2016 01:50:39 -0700 From: tip-bot for He Kuang Message-ID: Cc: linux-kernel@vger.kernel.org, acme@redhat.com, namhyung@kernel.org, eranian@google.com, ak@linux.intel.com, jpoimboe@redhat.com, adrian.hunter@intel.com, tumanova@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, mingo@kernel.org, mhiramat@kernel.org, dsahern@gmail.com, kan.liang@intel.com, wangnan0@huawei.com, peterz@infradead.org, jolsa@kernel.org, hpa@zytor.com, tglx@linutronix.de, sukadev@linux.vnet.ibm.com, penberg@kernel.org, hekuang@huawei.com Reply-To: adrian.hunter@intel.com, ak@linux.intel.com, jpoimboe@redhat.com, namhyung@kernel.org, eranian@google.com, linux-kernel@vger.kernel.org, acme@redhat.com, hekuang@huawei.com, penberg@kernel.org, hpa@zytor.com, sukadev@linux.vnet.ibm.com, tglx@linutronix.de, jolsa@kernel.org, wangnan0@huawei.com, peterz@infradead.org, kan.liang@intel.com, dsahern@gmail.com, mhiramat@kernel.org, tumanova@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, mingo@kernel.org In-Reply-To: <1464924803-22214-13-git-send-email-hekuang@huawei.com> References: <1464924803-22214-13-git-send-email-hekuang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf unwind: Introduce flag to separate local/remote unwind compilation Git-Commit-ID: 19473e7ba8f8f443f09d4187791de9d6f95fdc1d 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: 19473e7ba8f8f443f09d4187791de9d6f95fdc1d Gitweb: http://git.kernel.org/tip/19473e7ba8f8f443f09d4187791de9d6f95fdc1d Author: He Kuang AuthorDate: Fri, 3 Jun 2016 03:33:21 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 7 Jun 2016 15:11:46 -0300 perf unwind: Introduce flag to separate local/remote unwind compilation This is a preparation for including unwind-libunwind-local.c in other files for remote libunwind. 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/1464924803-22214-13-git-send-email-hekuang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/unwind-libunwind-local.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/perf/util/unwind-libunwind-local.c b/tools/perf/util/unwind-libunwind-local.c index 631b40d..01c2e86 100644 --- a/tools/perf/util/unwind-libunwind-local.c +++ b/tools/perf/util/unwind-libunwind-local.c @@ -22,8 +22,10 @@ #include #include #include +#ifndef REMOTE_UNWIND_LIBUNWIND #include #include +#endif #include "callchain.h" #include "thread.h" #include "session.h" @@ -689,5 +691,7 @@ _unwind_libunwind_ops = { .get_entries = _unwind__get_entries, }; +#ifndef REMOTE_UNWIND_LIBUNWIND struct unwind_libunwind_ops * local_unwind_libunwind_ops = &_unwind_libunwind_ops; +#endif