diff options
author | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-02-05 15:41:58 -0700 |
---|---|---|
committer | awilliam@xenbuild2.aw <awilliam@xenbuild2.aw> | 2007-02-05 15:41:58 -0700 |
commit | d7e51f76c87e031bab860bfc2086136d53c2f05a (patch) | |
tree | 3390aa9f4c9ac714ea293c42a9573bbe2ea95880 | |
parent | 8f3bd63696257f2a644eb7fb34efe1aa04709ce5 (diff) | |
download | xen-d7e51f76c87e031bab860bfc2086136d53c2f05a.tar.gz xen-d7e51f76c87e031bab860bfc2086136d53c2f05a.tar.bz2 xen-d7e51f76c87e031bab860bfc2086136d53c2f05a.zip |
[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>
-rw-r--r-- | unmodified_drivers/linux-2.6/overrides.mk | 3 | ||||
-rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/xen_support.c | 17 |
2 files changed, 20 insertions, 0 deletions
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 <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(); |