[Xen-changelog] [xen-3.4-testing] x86: Fix the build.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1254418743 -3600
# Node ID 97684ba1303ed28c6fb91007e235363da75758f2
# Parent  123e6ca38b5c4ca7e7baf5b4d005df1adb9d84e3
x86: Fix the build.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   20245:4ad29157dcd7
xen-unstable date:        Tue Sep 22 14:11:09 2009 +0100
---
 xen/arch/x86/tboot.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff -r 123e6ca38b5c -r 97684ba1303e xen/arch/x86/tboot.c
--- a/xen/arch/x86/tboot.c      Thu Oct 01 16:17:00 2009 +0100
+++ b/xen/arch/x86/tboot.c      Thu Oct 01 18:39:03 2009 +0100
@@ -73,19 +73,19 @@ static void tboot_copy_memory(unsigned c
 static void tboot_copy_memory(unsigned char *va, uint32_t size,
                               unsigned long pa)
 {
-    uint32_t map_base;
-    unsigned long map_addr;
-    int i;
-
-    map_base = 0;
-    for (i = 0; i < size; i++) {
-        if ( map_base != PFN_DOWN(pa + i) ) {
+    unsigned long map_base = 0;
+    unsigned char *map_addr = NULL;
+    unsigned int i;
+
+    for ( i = 0; i < size; i++ )
+    {
+        if ( map_base != PFN_DOWN(pa + i) )
+        {
             map_base = PFN_DOWN(pa + i);
             set_fixmap(FIX_TBOOT_MAP_ADDRESS, map_base << PAGE_SHIFT);
-            map_addr = (unsigned long)fix_to_virt(FIX_TBOOT_MAP_ADDRESS);
-        }
-        *(va + i) = *(unsigned char *)(map_addr + pa + i
-                                       - (map_base << PAGE_SHIFT));
+            map_addr = (unsigned char *)fix_to_virt(FIX_TBOOT_MAP_ADDRESS);
+        }
+        va[i] = map_addr[pa + i - (map_base << PAGE_SHIFT)];
     }
 }
 

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