Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992643Ab2KOGSZ (ORCPT ); Thu, 15 Nov 2012 01:18:25 -0500 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:53969 "EHLO e28smtp01.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889Ab2KOGSX (ORCPT ); Thu, 15 Nov 2012 01:18:23 -0500 Message-ID: <50A48912.20606@linux.vnet.ibm.com> Date: Thu, 15 Nov 2012 14:17:54 +0800 From: Xiao Guangrong User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Xiao Guangrong CC: Arnaldo Carvalho de Melo , Josh Boyer , David Howells , mingo@kernel.org, haodong@linux.vnet.ibm.com, runzhen@linux.vnet.ibm.com, dsahern@gmail.com, tglx@linutronix.de, bp@alien8.de, namhyung@gmail.com, torvalds@linux-foundation.org, paulus@samba.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Subject: [PATCH 2/2] perf kvm: fix building perf kvm on PowerPC References: <1378.1352379110@warthog.procyon.org.uk> <18065.1352820271@warthog.procyon.org.uk> <20121113163458.GA1023@ghostprotocols.net> <50A488DD.6090106@linux.vnet.ibm.com> In-Reply-To: <50A488DD.6090106@linux.vnet.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit x-cbid: 12111506-4790-0000-0000-000005905CE9 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1910 Lines: 58 Now, 'perf kvm stat' is only supported on x86, let its code depend on ARCH_X86 to fix building it on other architectures Signed-off-by: Xiao Guangrong --- tools/perf/arch/x86/Makefile | 2 ++ tools/perf/builtin-kvm.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile index 815841c..320fb95 100644 --- a/tools/perf/arch/x86/Makefile +++ b/tools/perf/arch/x86/Makefile @@ -1,3 +1,5 @@ +ARCH_CFLAGS += -DARCH_X86 + ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 7fb426b..75e998a 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -22,6 +22,7 @@ #include #include +#ifdef ARCH_X86 #include "../../arch/x86/include/asm/svm.h" #include "../../arch/x86/include/asm/vmx.h" #include "../../arch/x86/include/asm/kvm.h" @@ -913,6 +914,7 @@ static int kvm_cmd_stat(const char *file_name, int argc, const char **argv) perf_stat: return cmd_stat(argc, argv, NULL); } +#endif static int __cmd_record(const char *file_name, int argc, const char **argv) { @@ -1035,8 +1037,10 @@ int cmd_kvm(int argc, const char **argv, const char *prefix __maybe_unused) return cmd_top(argc, argv, NULL); else if (!strncmp(argv[0], "buildid-list", 12)) return __cmd_buildid_list(file_name, argc, argv); +#ifdef ARCH_X86 else if (!strncmp(argv[0], "stat", 4)) return kvm_cmd_stat(file_name, argc, argv); +#endif else usage_with_options(kvm_usage, kvm_options); -- 1.7.7.6 -- 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/