[PATCH] mm: fix some compile errors on x86 arch

[PATCH] mm: fix some compile errors on x86 arch

[Wei Yongjun]

This patch fixed the following compile errors on x86 arch:

p2m.c: In function ‘p2m_change_type_global’:
p2m.c:2211: error: ‘i4’ undeclared (first use in this function)

mem_sharing.c: In function ‘mem_sharing_hash_delete’:
mem_sharing.c:217: error: format ‘%lx’ expects type ‘long unsigned int’,
but argument 2 has type ‘shr_handle_t’

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>

diff -r 1b81d0607af9 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 17:55:24 2009 +0800
@@ -214,7 +214,7 @@
         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 %llx\n", handle);
     BUG();
 } 
 
diff -r 1b81d0607af9 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 17:55:24 2009 +0800
@@ -2208,7 +2208,11 @@
                     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 @@
                     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);