[Xen-changelog] [xen-unstable] x86_32: Build fixes after page-sharing patches.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1261066159 0
# Node ID 750a177eeca5c94d7babc38cbe3893c22e431890
# Parent  1b81d0607af90b33ae80232855afc68eefce94d0
x86_32: Build fixes after page-sharing patches.

Signed-off-by: Wei Yongjun <yjwei@xxxxxxxxxxxxxx>
---
 xen/arch/x86/mm/mem_sharing.c |    2 +-
 xen/arch/x86/mm/p2m.c         |   12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff -r 1b81d0607af9 -r 750a177eeca5 xen/arch/x86/mm/mem_sharing.c
--- a/xen/arch/x86/mm/mem_sharing.c     Thu Dec 17 06:27:57 2009 +0000
+++ b/xen/arch/x86/mm/mem_sharing.c     Thu Dec 17 16:09:19 2009 +0000
@@ -214,7 +214,7 @@ static void mem_sharing_hash_delete(shr_
         pprev = &e->next;
         e = e->next;
     }
-    printk("Could not find shr entry for handle %lx\n", handle);
+    printk("Could not find shr entry for handle %"PRIx64"\n", handle);
     BUG();
 } 
 
diff -r 1b81d0607af9 -r 750a177eeca5 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Thu Dec 17 06:27:57 2009 +0000
+++ b/xen/arch/x86/mm/p2m.c     Thu Dec 17 16:09:19 2009 +0000
@@ -2208,7 +2208,11 @@ void p2m_change_type_global(struct domai
                     mfn = l2e_get_pfn(l2e[i2]);
                     /* Do not use get_gpfn_from_mfn because it may return 
                        SHARED_M2P_ENTRY */
-                    gfn = (i2 + (i3 + (i4 * L3_PAGETABLE_ENTRIES))
+                    gfn = (i2 + (i3
+#if CONFIG_PAGING_LEVELS >= 4
+                                  + (i4 * L3_PAGETABLE_ENTRIES)
+#endif
+                               )
                            * L2_PAGETABLE_ENTRIES) * L1_PAGETABLE_ENTRIES; 
                     flags = p2m_type_to_flags(nt);
                     l1e_content = l1e_from_pfn(mfn, flags | _PAGE_PSE);
@@ -2226,7 +2230,11 @@ void p2m_change_type_global(struct domai
                     if ( p2m_flags_to_type(flags) != ot )
                         continue;
                     mfn = l1e_get_pfn(l1e[i1]);
-                    gfn = i1 + (i2 + (i3 + (i4 * L3_PAGETABLE_ENTRIES))
+                    gfn = i1 + (i2 + (i3
+#if CONFIG_PAGING_LEVELS >= 4
+                                       + (i4 * L3_PAGETABLE_ENTRIES)
+#endif
+                                    )
                            * L2_PAGETABLE_ENTRIES) * L1_PAGETABLE_ENTRIES; 
                     /* create a new 1le entry with the new type */
                     flags = p2m_type_to_flags(nt);

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