[Xen-changelog] [xen-unstable] ia64: fix build (once more)

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1331210964 -3600
# Node ID 07adf050e1f463987f05070d586e564d8832f224
# Parent  72cda52c45d98d674582a9b746fd0cf6ee846e78
ia64: fix build (once more)

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r 72cda52c45d9 -r 07adf050e1f4 xen/arch/ia64/xen/dom0_ops.c
--- a/xen/arch/ia64/xen/dom0_ops.c      Thu Mar 08 12:30:03 2012 +0000
+++ b/xen/arch/ia64/xen/dom0_ops.c      Thu Mar 08 13:49:24 2012 +0100
@@ -558,7 +558,7 @@
 
         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 -r 72cda52c45d9 -r 07adf050e1f4 xen/common/tmem_xen.c
--- a/xen/common/tmem_xen.c     Thu Mar 08 12:30:03 2012 +0000
+++ b/xen/common/tmem_xen.c     Thu Mar 08 13:49:24 2012 +0100
@@ -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 @@
     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)
 {

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