[Xen-changelog] [xen-unstable] ia64: build fixes (again)

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1322124294 -3600
# Node ID b082fdc52ad7607d93b59148fb289aafe21f294b
# Parent  84b3e46aa7d24a4605c36940606e7da9679b0e7f
ia64: build fixes (again)

This undoes a single change from c/s 24136:3622d7fae14d
(common/grant_table.c) and several from c/s 24100:be8daf78856a
(common/memory.c). It also completes the former with two previously
missing ia64 specific code adjustments. Authors Cc-ed.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
---


diff -r 84b3e46aa7d2 -r b082fdc52ad7 xen/common/grant_table.c
--- a/xen/common/grant_table.c  Wed Nov 23 12:03:37 2011 +0000
+++ b/xen/common/grant_table.c  Thu Nov 24 09:44:54 2011 +0100
@@ -173,7 +173,7 @@
        rc = GNTST_bad_page;
     }
 #else
-    *frame = readonly ? get_gfn_untyped(rd, gfn) : gfn_to_mfn_private(rd, gfn);
+    *frame = readonly ? gmfn_to_mfn(rd, gfn) : gfn_to_mfn_private(rd, gfn);
 #endif
 
     return rc;
diff -r 84b3e46aa7d2 -r b082fdc52ad7 xen/common/memory.c
--- a/xen/common/memory.c       Wed Nov 23 12:03:37 2011 +0000
+++ b/xen/common/memory.c       Thu Nov 24 09:44:54 2011 +0100
@@ -165,7 +165,7 @@
     mfn = mfn_x(get_gfn(d, gmfn, &p2mt)); 
     if ( unlikely(p2m_is_paging(p2mt)) )
     {
-        guest_physmap_remove_page(d, gmfn, mfn, PAGE_ORDER_4K);
+        guest_physmap_remove_page(d, gmfn, mfn, 0);
         p2m_mem_paging_drop_page(d, gmfn);
         put_gfn(d, gmfn);
         return 1;
@@ -188,7 +188,7 @@
     if(p2m_is_shared(p2mt))
     {
         put_page_and_type(page);
-        guest_physmap_remove_page(d, gmfn, mfn, PAGE_ORDER_4K);
+        guest_physmap_remove_page(d, gmfn, mfn, 0);
         put_gfn(d, gmfn);
         return 1;
     }
@@ -207,7 +207,7 @@
     if ( test_and_clear_bit(_PGC_allocated, &page->count_info) )
         put_page(page);
 
-    guest_physmap_remove_page(d, gmfn, mfn, PAGE_ORDER_4K);
+    guest_physmap_remove_page(d, gmfn, mfn, 0);
 
     put_page(page);
     put_gfn(d, gmfn);
@@ -427,7 +427,7 @@
             gfn = mfn_to_gmfn(d, mfn);
             /* Pages were unshared above */
             BUG_ON(SHARED_M2P(gfn));
-            guest_physmap_remove_page(d, gfn, mfn, PAGE_ORDER_4K);
+            guest_physmap_remove_page(d, gfn, mfn, 0);
             put_page(page);
         }
 
diff -r 84b3e46aa7d2 -r b082fdc52ad7 xen/common/tmem_xen.c
--- a/xen/common/tmem_xen.c     Wed Nov 23 12:03:37 2011 +0000
+++ b/xen/common/tmem_xen.c     Thu Nov 24 09:44:54 2011 +0100
@@ -95,7 +95,7 @@
     return NULL;
 }
 
-static inline void cli_put_page(void *cli_va, pfp_t *cli_pfp,
+static inline void cli_put_page(tmem_cli_mfn_t cmfn, void *cli_va, pfp_t 
*cli_pfp,
                                 unsigned long cli_mfn, bool_t mark_dirty)
 {
     ASSERT(0);
diff -r 84b3e46aa7d2 -r b082fdc52ad7 xen/include/asm-ia64/mm.h
--- a/xen/include/asm-ia64/mm.h Wed Nov 23 12:03:37 2011 +0000
+++ b/xen/include/asm-ia64/mm.h Thu Nov 24 09:44:54 2011 +0100
@@ -532,6 +532,7 @@
                                u64* itir, struct p2m_entry* entry);
 #define machine_to_phys_mapping        mpt_table
 
+#define INVALID_GFN              (~0UL)
 #define INVALID_M2P_ENTRY        (~0UL)
 #define VALID_M2P(_e)            (!((_e) & (1UL<<63)))
 #define SHARED_M2P(_e)           0

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