[IA64] Fix for compiling PV-on-HVM driver on IPF

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@jp.fujitsu.com>
Signed-off-by: Anthony Xu <anthony.xu@intel.com>

diff --git a/unmodified_drivers/linux-2.6/overrides.mk b/unmodified_drivers/linux-2.6/overrides.mk
index 81416b2b104c6ce9c9a8b75d446b54d76b511b90..818723a49235f4741138c9fc56714ff2efff1d33 100644 (file)
--- a/unmodified_drivers/linux-2.6/overrides.mk
+++ b/unmodified_drivers/linux-2.6/overrides.mk
@@ -6,3 +6,6 @@
 # a Xen kernel to find the right headers)
 EXTRA_CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030202
 EXTRA_CFLAGS += -I$(M)/include -I$(M)/compat-include -DHAVE_XEN_PLATFORM_COMPAT_H
+ifeq ($(ARCH),ia64)
+  EXTRA_CFLAGS += -DCONFIG_VMX_GUEST
+endif

diff --git a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
index 423d2f2e24d0cf9350188ed013179e6d8019db91..589d8365ec24732189a6758f97f0c6dfa81cc778 100644 (file)
--- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c
@@ -30,6 +30,23 @@
 #include <xen/platform-compat.h>
 #endif
 
+#if defined (__ia64__)
+unsigned long __hypercall(unsigned long a1, unsigned long a2,
+                         unsigned long a3, unsigned long a4,
+                         unsigned long a5, unsigned long cmd)
+{
+       unsigned long __res;
+       __asm__ __volatile__ (";;\n"
+               "mov r2=%1\n"
+               "break 0x1000 ;;\n"
+               "mov %0=r8 ;;\n"
+               : "=r"(__res) : "r"(cmd) : "r2", "r8", "memory");
+
+       return __res;
+}
+EXPORT_SYMBOL(__hypercall);
+#endif
+
 void xen_machphys_update(unsigned long mfn, unsigned long pfn)
 {
        BUG();