[Xen-changelog] [xen-unstable] [IA64] Fix for compiling PV-on-HVM driver on IPF

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

# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1170715318 25200
# Node ID d7f7021902a2c6b5beee0abfdbdc89fce7892450
# Parent  d879bbaa3faab772fab94bab6cb8f5ee2689b3fc
[IA64] Fix for compiling PV-on-HVM driver on IPF

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@xxxxxxxxxxxxxx>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@xxxxxxxxxxxxxx>
Signed-off-by: Anthony Xu <anthony.xu@xxxxxxxxx>
---
 unmodified_drivers/linux-2.6/overrides.mk               |    3 ++
 unmodified_drivers/linux-2.6/platform-pci/xen_support.c |   17 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff -r d879bbaa3faa -r d7f7021902a2 unmodified_drivers/linux-2.6/overrides.mk
--- a/unmodified_drivers/linux-2.6/overrides.mk Mon Feb 05 15:23:39 2007 -0700
+++ b/unmodified_drivers/linux-2.6/overrides.mk Mon Feb 05 15:41:58 2007 -0700
@@ -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 -r d879bbaa3faa -r d7f7021902a2 
unmodified_drivers/linux-2.6/platform-pci/xen_support.c
--- a/unmodified_drivers/linux-2.6/platform-pci/xen_support.c   Mon Feb 05 
15:23:39 2007 -0700
+++ b/unmodified_drivers/linux-2.6/platform-pci/xen_support.c   Mon Feb 05 
15:41:58 2007 -0700
@@ -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();

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