From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
To: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
Josh Boyer <jwboyer@gmail.com>,
David Howells <dhowells@redhat.com>,
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
Date: Thu, 15 Nov 2012 14:17:54 +0800 [thread overview]
Message-ID: <50A48912.20606@linux.vnet.ibm.com> (raw)
In-Reply-To: <50A488DD.6090106@linux.vnet.ibm.com>
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 <xiaoguangrong@linux.vnet.ibm.com>
---
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 <pthread.h>
#include <math.h>
+#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
next prev parent reply other threads:[~2012-11-15 6:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-08 12:51 [GIT PULL] UAPI: perf fixes David Howells
2012-11-12 20:23 ` Josh Boyer
2012-11-13 11:11 ` David Howells
2012-11-13 11:12 ` David Howells
2012-11-13 12:51 ` Josh Boyer
2012-11-13 15:24 ` David Howells
2012-11-13 15:42 ` Josh Boyer
2012-11-13 16:34 ` Arnaldo Carvalho de Melo
2012-11-15 2:23 ` Xiao Guangrong
2012-11-15 6:17 ` [PATCH 1/2] perf kvm: rename perf_kvm to perf_kvm_stat Xiao Guangrong
2012-11-15 6:17 ` Xiao Guangrong [this message]
2012-11-15 10:46 ` [PATCH 2/2] perf kvm: fix building perf kvm on PowerPC David Howells
2012-11-19 8:19 ` Xiao Guangrong
2012-12-01 11:21 ` [tip:perf/urgent] perf kvm: Fix building perf kvm on non x86 arches tip-bot for Xiao Guangrong
2012-11-19 22:22 ` [PATCH 2/2] perf kvm: fix building perf kvm on PowerPC David Howells
2012-12-01 11:20 ` [tip:perf/urgent] perf kvm: Rename perf_kvm to perf_kvm_stat tip-bot for Xiao Guangrong
2012-12-01 11:15 ` [tip:perf/urgent] tools: Define a Makefile function to do subdir processing tip-bot for David Howells
2012-12-01 11:16 ` [tip:perf/urgent] tools: Honour the O= flag when tool build called from a higher Makefile tip-bot for David Howells
2012-12-08 15:07 ` [tip:perf/core] tools: Define a Makefile function to do subdir processing tip-bot for David Howells
2012-12-08 15:08 ` [tip:perf/core] tools: Honour the O= flag when tool build called from a higher Makefile tip-bot for David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50A48912.20606@linux.vnet.ibm.com \
--to=xiaoguangrong@linux.vnet.ibm.com \
--cc=acme@ghostprotocols.net \
--cc=bp@alien8.de \
--cc=dhowells@redhat.com \
--cc=dsahern@gmail.com \
--cc=haodong@linux.vnet.ibm.com \
--cc=jwboyer@gmail.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@gmail.com \
--cc=paulus@samba.org \
--cc=runzhen@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).