[Xen-changelog] [xen-unstable] [IA64] xenoprof: fix ia64 build

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1281105719 -3600
# Node ID a904221a56c2787b79c303812135fa7fc9e146d5
# Parent  6f07d9ac1e7cd145fb2770bb11655ac1161b58da
[IA64] xenoprof: fix ia64 build

21902:2c6ae364ed7b ("xenoprofile: Add IBS support") breaks ia64.
This patch fixes it.

Signed-off-by: KUWAMURA Shin'ya <kuwa@xxxxxxxxxxxxxx>
---
 xen/common/xenoprof.c           |    3 ---
 xen/include/asm-ia64/xenoprof.h |    7 +++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff -r 6f07d9ac1e7c -r a904221a56c2 xen/common/xenoprof.c
--- a/xen/common/xenoprof.c     Thu Aug 05 14:41:14 2010 +0100
+++ b/xen/common/xenoprof.c     Fri Aug 06 15:41:59 2010 +0100
@@ -48,9 +48,6 @@ static u64 passive_samples;
 static u64 passive_samples;
 static u64 idle_samples;
 static u64 others_samples;
-
-/* AMD IBS support */
-extern u32 ibs_caps;
 
 int acquire_pmu_ownership(int pmu_ownship)
 {
diff -r 6f07d9ac1e7c -r a904221a56c2 xen/include/asm-ia64/xenoprof.h
--- a/xen/include/asm-ia64/xenoprof.h   Thu Aug 05 14:41:14 2010 +0100
+++ b/xen/include/asm-ia64/xenoprof.h   Fri Aug 06 15:41:59 2010 +0100
@@ -33,6 +33,13 @@ void xenoprof_arch_stop(void);
 void xenoprof_arch_stop(void);
 void xenoprof_arch_disable_virq(void);
 void xenoprof_arch_release_counters(void);
+
+static inline int xenoprof_arch_ibs_counter(XEN_GUEST_HANDLE(void) arg)
+{
+    return -ENOSYS;  /* not supported */
+}
+/* AMD IBS not supported */
+#define ibs_caps       0
 
 struct vcpu;
 struct cpu_user_regs;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog