PV-on-HVM: Avoid undefined symbol in netfront module when building

against native Linux 2.6.18.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/include/asm-i386/mach-xen/asm/hypervisor.h b/include/asm-i386/mach-xen/asm/hypervisor.h
index 8d385e2dee9e054d986ff9c17f5588e7be2ca517..abb678809341f1ef94caa1d7431ab102ff1e60c3 100644 (file)
--- a/include/asm-i386/mach-xen/asm/hypervisor.h
+++ b/include/asm-i386/mach-xen/asm/hypervisor.h
@@ -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, unsigned int cmd,
     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;
+#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
-    mcl->args[MULTI_UVMFLAGS_INDEX] = flags;
-    mcl->args[MULTI_UVMDOMID_INDEX] = domid;
-}
 
 #endif /* __HYPERVISOR_H__ */