[Xen-changelog] [linux-2.6.18-xen] PV-on-HVM: Avoid undefined symbol in netfront module when building

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1191928479 -3600
# Node ID caacda7fe7cf6a893034b7cae14e6586400454ac
# Parent  b0ec211da98add875d74f75a881fae0c6ac4f484
PV-on-HVM: Avoid undefined symbol in netfront module when building
against native Linux 2.6.18.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 include/asm-i386/mach-xen/asm/hypervisor.h |   28 +++++++++-------------------
 1 files changed, 9 insertions(+), 19 deletions(-)

diff -r b0ec211da98a -r caacda7fe7cf include/asm-i386/mach-xen/asm/hypervisor.h
--- a/include/asm-i386/mach-xen/asm/hypervisor.h        Fri Oct 05 10:51:53 
2007 +0100
+++ b/include/asm-i386/mach-xen/asm/hypervisor.h        Tue Oct 09 12:14:39 
2007 +0100
@@ -213,6 +213,8 @@ HYPERVISOR_poll(
        return rc;
 }
 
+#ifdef CONFIG_XEN
+
 static inline void
 MULTI_update_va_mapping(
     multicall_entry_t *mcl, unsigned long va,
@@ -242,24 +244,12 @@ MULTI_grant_table_op(multicall_entry_t *
     mcl->args[2] = count;
 }
 
-static inline void
-MULTI_update_va_mapping_otherdomain(
-    multicall_entry_t *mcl, unsigned long va,
-    pte_t new_val, unsigned long flags, domid_t domid)
-{
-    mcl->op = __HYPERVISOR_update_va_mapping_otherdomain;
-    mcl->args[0] = va;
-#if defined(CONFIG_X86_64)
-    mcl->args[1] = new_val.pte;
-#elif defined(CONFIG_X86_PAE)
-    mcl->args[1] = new_val.pte_low;
-    mcl->args[2] = new_val.pte_high;
-#else
-    mcl->args[1] = new_val.pte_low;
-    mcl->args[2] = 0;
-#endif
-    mcl->args[MULTI_UVMFLAGS_INDEX] = flags;
-    mcl->args[MULTI_UVMDOMID_INDEX] = domid;
-}
+#else /* !defined(CONFIG_XEN) */
+
+/* Multicalls not supported for HVM guests. */
+#define MULTI_update_va_mapping(a,b,c,d) ((void)0)
+#define MULTI_grant_table_op(a,b,c,d) ((void)0)
+
+#endif
 
 #endif /* __HYPERVISOR_H__ */

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