From 26221b06f51e369a32d48cb5c7445fe1e67e67df Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Wed, 8 Aug 2012 17:21:23 +0000
Subject: [PATCH] --- yaml --- r: 330401 b: refs/heads/master c:
 ca981633761c4d38a5b8b2889977a9078d5b9c99 h: refs/heads/master i:   330399:
 cab2a2aa6dd0e042853b8ee5ffb69d95c01caada v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/arm/include/asm/xen/hypercall.h | 19 +++++++++++++++++++
 trunk/drivers/net/xen-netback/netback.c    |  1 +
 trunk/drivers/net/xen-netfront.c           |  1 +
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a56246ab846c..fb394faaf00c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e79affc3f2461fc927ed5d09adfb6348b258e88b
+refs/heads/master: ca981633761c4d38a5b8b2889977a9078d5b9c99
diff --git a/trunk/arch/arm/include/asm/xen/hypercall.h b/trunk/arch/arm/include/asm/xen/hypercall.h
index 4ac062414369..8a823253d775 100644
--- a/trunk/arch/arm/include/asm/xen/hypercall.h
+++ b/trunk/arch/arm/include/asm/xen/hypercall.h
@@ -47,4 +47,23 @@ unsigned long HYPERVISOR_hvm_op(int op, void *arg);
 int HYPERVISOR_memory_op(unsigned int cmd, void *arg);
 int HYPERVISOR_physdev_op(int cmd, void *arg);
 
+static inline void
+MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,
+			unsigned int new_val, unsigned long flags)
+{
+	BUG();
+}
+
+static inline void
+MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req,
+		 int count, int *success_count, domid_t domid)
+{
+	BUG();
+}
+
+static inline int
+HYPERVISOR_multicall(void *call_list, int nr_calls)
+{
+	BUG();
+}
 #endif /* _ASM_ARM_XEN_HYPERCALL_H */
diff --git a/trunk/drivers/net/xen-netback/netback.c b/trunk/drivers/net/xen-netback/netback.c
index 682633bfe00f..1c0a30240d97 100644
--- a/trunk/drivers/net/xen-netback/netback.c
+++ b/trunk/drivers/net/xen-netback/netback.c
@@ -40,6 +40,7 @@
 
 #include <net/tcp.h>
 
+#include <xen/xen.h>
 #include <xen/events.h>
 #include <xen/interface/memory.h>
 
diff --git a/trunk/drivers/net/xen-netfront.c b/trunk/drivers/net/xen-netfront.c
index 650f79a1f2bd..24d968ddb543 100644
--- a/trunk/drivers/net/xen-netfront.c
+++ b/trunk/drivers/net/xen-netfront.c
@@ -43,6 +43,7 @@
 #include <linux/slab.h>
 #include <net/ip.h>
 
+#include <asm/xen/page.h>
 #include <xen/xen.h>
 #include <xen/xenbus.h>
 #include <xen/events.h>