From d7e51f76c87e031bab860bfc2086136d53c2f05a Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild2.aw" Date: Mon, 5 Feb 2007 15:41:58 -0700 Subject: [IA64] Fix for compiling PV-on-HVM driver on IPF Signed-off-by: Tsunehisa Doi Signed-off-by: Tomonari Horikoshi Signed-off-by: Anthony Xu --- unmodified_drivers/linux-2.6/overrides.mk | 3 +++ unmodified_drivers/linux-2.6/platform-pci/xen_support.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) (limited to 'unmodified_drivers') diff --git a/unmodified_drivers/linux-2.6/overrides.mk b/unmodified_drivers/linux-2.6/overrides.mk index 81416b2b10..818723a492 100644 --- 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 423d2f2e24..589d8365ec 100644 --- 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 #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(); -- cgit v1.2.3