[Xen-changelog] [xen-unstable] ia64: fix build in grant table and tmem code

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1287922662 -3600
# Node ID 3cc432c22073184e28c45ac6dd72647bee1f6de8
# Parent  07472842a840098a4604bf0606b1fe18fcea8b1e
ia64: fix build in grant table and tmem code

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/common/grant_table.c |    6 +++++-
 xen/common/tmem_xen.c    |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff -r 07472842a840 -r 3cc432c22073 xen/common/grant_table.c
--- a/xen/common/grant_table.c  Sun Oct 24 13:17:07 2010 +0100
+++ b/xen/common/grant_table.c  Sun Oct 24 13:17:42 2010 +0100
@@ -142,10 +142,11 @@ shared_entry_header(struct grant_table *
 /* Check if the page has been paged out */
 static int __get_paged_frame(unsigned long gfn, unsigned long *frame, int 
readonly, struct domain *rd)
 {
+    int rc = GNTST_okay;
+#if defined(P2M_PAGED_TYPES) || defined(P2M_SHARED_TYPES)
     struct p2m_domain *p2m;
     p2m_type_t p2mt;
     mfn_t mfn;
-    int rc = GNTST_okay;
     
     p2m = p2m_get_hostp2m(rd);
     if ( readonly )
@@ -163,6 +164,9 @@ static int __get_paged_frame(unsigned lo
        *frame = INVALID_MFN;
        rc = GNTST_bad_page;
     }
+#else
+    *frame = readonly ? gmfn_to_mfn(rd, gfn) : gfn_to_mfn_private(rd, gfn);
+#endif
     
     return rc;
 }
diff -r 07472842a840 -r 3cc432c22073 xen/common/tmem_xen.c
--- a/xen/common/tmem_xen.c     Sun Oct 24 13:17:07 2010 +0100
+++ b/xen/common/tmem_xen.c     Sun Oct 24 13:17:42 2010 +0100
@@ -95,8 +95,8 @@ static inline void *cli_get_page(tmem_cl
     return NULL;
 }
 
-static inline void cli_put_page(void *cli_va, struct page_info *cli_pfp,
-                                bool_t mark_dirty)
+static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp,
+                                unsigned long cli_mfn, bool_t mark_dirty)
 {
     ASSERT(0);
 }

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