From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 8 Mar 2012 12:49:24 +0000 (+0100)
Subject: ia64: fix build (once more)
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=48844dc21098fa59f1cac06eba31b548f576a446;p=xen.git

ia64: fix build (once more)

Signed-off-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c
index a372d58221..57a1905f32 100644
--- a/xen/arch/ia64/xen/dom0_ops.c
+++ b/xen/arch/ia64/xen/dom0_ops.c
@@ -558,7 +558,7 @@ long arch_do_domctl(xen_domctl_t *op, XEN_GUEST_HANDLE(xen_domctl_t) u_domctl)
 
         switch(mec->op)
         {
-            case XEN_DOMCTL_MEM_EVENT_OP_SHARING_CONTROL:
+            case XEN_DOMCTL_MEM_SHARING_CONTROL:
             {
                 if (mec->u.enable) {
                     ret = -EINVAL; /* not implemented */
diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c
index 9b2a22cb76..37e82896f5 100644
--- a/xen/common/tmem_xen.c
+++ b/xen/common/tmem_xen.c
@@ -13,7 +13,6 @@
 #include <xen/domain_page.h>
 #include <xen/cpu.h>
 #include <xen/init.h>
-#include <asm/p2m.h>
 
 #define EXPORT /* indicates code other modules are dependent upon */
 
@@ -103,6 +102,8 @@ static inline void cli_put_page(tmem_cli_mfn_t cmfn, void *cli_va, pfp_t *cli_pf
     ASSERT(0);
 }
 #else
+#include <asm/p2m.h>
+
 static inline void *cli_get_page(tmem_cli_mfn_t cmfn, unsigned long *pcli_mfn,
                                  pfp_t **pcli_pfp, bool_t cli_write)
 {