From 98438bca454bec2d75ef5bfbb5df9ca5e93ea239 Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@hp.com>
Date: Wed, 12 Sep 2007 09:38:50 -0600
Subject: [PATCH] [IA64] Minor fix of xcom_hcall.c for pv-on-hvm.

- compilation fix.
  hypercall.h shouldn't be included directly. intead include hypervisor.h
- In RHEL4U4, insmod xen-platform-pci.ko failed with these patches.
  xen_platform_pci: Unknown symbol xencomm_arch_hypercall_suspend
  comment out xencomm_hypercall_suspend() because suspend hypercall isn't
  necessary for VTi domain.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 arch/ia64/xen/xcom_hcall.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/ia64/xen/xcom_hcall.c b/arch/ia64/xen/xcom_hcall.c
index 591edf78..755eb210 100644
--- a/arch/ia64/xen/xcom_hcall.c
+++ b/arch/ia64/xen/xcom_hcall.c
@@ -39,7 +39,7 @@
 #include <xen/interface/hvm/params.h>
 #include <xen/interface/xenoprof.h>
 #include <xen/interface/vcpu.h>
-#include <asm/hypercall.h>
+#include <asm/hypervisor.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
 #include <asm/xen/xencomm.h>
@@ -483,6 +483,7 @@ xencomm_hypercall_hvm_op(int cmd, void *arg)
 }
 EXPORT_SYMBOL_GPL(xencomm_hypercall_hvm_op);
 
+#ifndef CONFIG_VMX_GUEST
 int
 xencomm_hypercall_suspend(unsigned long srec)
 {
@@ -493,6 +494,7 @@ xencomm_hypercall_suspend(unsigned long srec)
 	return xencomm_arch_hypercall_suspend(
 		xencomm_map_no_alloc(&arg, sizeof(arg)));
 }
+#endif
 
 int
 xencomm_hypercall_xenoprof_op(int op, void *arg)
-- 
2.39.5