[XenPPC] [xenppc-unstable] [POWERPC][XEN] Merge build fixes.

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

# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Node ID e59e7c07211368cb0af3a9d613c0b56b19b25a27
# Parent  3e54d5313968ff89323126a105f1852871b17a3f
[POWERPC][XEN] Merge build fixes.
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
 xen/common/memory.c              |    4 ++--
 xen/include/asm-powerpc/domain.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 3e54d5313968 -r e59e7c072113 xen/common/memory.c
--- a/xen/common/memory.c       Thu Nov 16 18:19:06 2006 -0600
+++ b/xen/common/memory.c       Tue Nov 21 15:16:20 2006 -0600
@@ -82,8 +82,8 @@ static void increase_reservation(struct 
             goto out;
         }
 
-               /* XXX PPC-specific hack */
-        BUG_ON(0 > arch_domain_add_extent(d, page, extent_order));
+        /* XXX PPC-specific hack */
+        BUG_ON(0 > arch_domain_add_extent(d, page, a->extent_order));
 
         /* Inform the domain of the new page's machine address. */ 
         if ( !guest_handle_is_null(a->extent_list) )
diff -r 3e54d5313968 -r e59e7c072113 xen/include/asm-powerpc/domain.h
--- a/xen/include/asm-powerpc/domain.h  Thu Nov 16 18:19:06 2006 -0600
+++ b/xen/include/asm-powerpc/domain.h  Tue Nov 21 15:16:20 2006 -0600
@@ -89,7 +89,7 @@ struct arch_vcpu {
     struct slb_entry slb_entries[NUM_SLB_ENTRIES];
 
     /* I/O-port access bitmap. */
-    u8 *iobmp;        /* Guest kernel virtual address of the bitmap. */
+    XEN_GUEST_HANDLE(uint8_t) iobmp; /* Guest kernel virtual address of the 
bitmap. */
     int iobmp_limit;  /* Number of ports represented in the bitmap.  */
     int iopl;         /* Current IOPL for this VCPU. */
 

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