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

--- 2010-10-22.orig/xen/common/grant_table.c	2010-10-11 09:11:38.000000000 +0200
+++ 2010-10-22/xen/common/grant_table.c	2010-10-22 14:55:19.000000000 +0200
@@ -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;
 }
--- 2010-10-22.orig/xen/common/tmem_xen.c	2010-10-11 09:11:38.000000000 +0200
+++ 2010-10-22/xen/common/tmem_xen.c	2010-10-22 14:58:43.000000000 +0200
@@ -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);
 }