[Xen-changelog] [xen-4.0-testing] x86 shadow: Fix x86_32 build.

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1278094717 -3600
# Node ID b3e6085141005bc3746dbf8149206da5d801fc70
# Parent  b9d2db109cf5a95815dfb6e38b991feb528e1276
x86 shadow: Fix x86_32 build.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   21649:74fa38447ad9
xen-unstable date:        Tue Jun 22 07:19:16 2010 +0100
---
 xen/arch/x86/mm/shadow/multi.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff -r b9d2db109cf5 -r b3e608514100 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Fri Jul 02 19:17:36 2010 +0100
+++ b/xen/arch/x86/mm/shadow/multi.c    Fri Jul 02 19:18:37 2010 +0100
@@ -4671,7 +4671,7 @@ static void sh_pagetable_dying(struct vc
     paddr_t gcr3 = 0;
     mfn_t smfn, gmfn;
     p2m_type_t p2mt;
-    unsigned long gl3pa;
+    char *gl3pa = NULL;
     guest_l3e_t *gl3e = NULL;
     paddr_t gl2a = 0;
 
@@ -4685,13 +4685,14 @@ static void sh_pagetable_dying(struct vc
     gmfn = gfn_to_mfn_query(v->domain, _gfn(gpa >> PAGE_SHIFT), &p2mt);
     if ( !mfn_valid(gmfn) || !p2m_is_ram(p2mt) )
     {
-        printk(XENLOG_DEBUG "sh_pagetable_dying: gpa not valid %lx\n", gpa);
+        printk(XENLOG_DEBUG "sh_pagetable_dying: gpa not valid %"PRIpaddr"\n",
+               gpa);
         goto out;
     }
     if ( !fast_path )
     {
-        gl3pa = (unsigned long) sh_map_domain_page(gmfn);
-        gl3e = (guest_l3e_t *) (gl3pa + (gpa & ~PAGE_MASK));
+        gl3pa = sh_map_domain_page(gmfn);
+        gl3e = (guest_l3e_t *)(gl3pa + ((unsigned long)gpa & ~PAGE_MASK));
     }
     for ( i = 0; i < 4; i++ )
     {

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