Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752126AbbKWQGc (ORCPT ); Mon, 23 Nov 2015 11:06:32 -0500 Received: from terminus.zytor.com ([198.137.202.10]:43699 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751190AbbKWQG3 (ORCPT ); Mon, 23 Nov 2015 11:06:29 -0500 Date: Mon, 23 Nov 2015 08:05:52 -0800 From: tip-bot for Wang Nan Message-ID: Cc: hekuang@huawei.com, masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, hpa@zytor.com, ast@kernel.org, linux-kernel@vger.kernel.org, lizefan@huawei.com, wangnan0@huawei.com Reply-To: lizefan@huawei.com, wangnan0@huawei.com, ast@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, hekuang@huawei.com, masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de In-Reply-To: <1447675815-166222-10-git-send-email-wangnan0@huawei.com> References: <1447675815-166222-10-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf bpf: Compile dwarf-regs.c if CONFIG_BPF_PROLOGUE is on Git-Commit-ID: 30433a3a52b951faab95944e0f8b9d33a1e322ce 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 Content-Length: 1793 Lines: 44 Commit-ID: 30433a3a52b951faab95944e0f8b9d33a1e322ce Gitweb: http://git.kernel.org/tip/30433a3a52b951faab95944e0f8b9d33a1e322ce Author: Wang Nan AuthorDate: Mon, 16 Nov 2015 12:10:11 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 18 Nov 2015 17:51:03 -0300 perf bpf: Compile dwarf-regs.c if CONFIG_BPF_PROLOGUE is on regs_query_register_offset() in dwarf-regs.c is required by BPF prologue. This patch compiles it if CONFIG_BPF_PROLOGUE is on to avoid build failure when CONFIG_BPF_PROLOGUE is on but CONFIG_DWARF is not set. Signed-off-by: He Kuang Acked-by: Masami Hiramatsu Cc: Alexei Starovoitov Cc: He Kuang Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1447675815-166222-10-git-send-email-wangnan0@huawei.com Signed-off-by: Wang Nan Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/x86/util/Build | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build index ff63649..4659703 100644 --- a/tools/perf/arch/x86/util/Build +++ b/tools/perf/arch/x86/util/Build @@ -5,6 +5,7 @@ libperf-y += kvm-stat.o libperf-y += perf_regs.o libperf-$(CONFIG_DWARF) += dwarf-regs.o +libperf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/