# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/06/23 16:12:23-04:00 jnakajim@build64.(none) 
#   Get domU up to mount_block_root().
#   
#   Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
#   Signed-off-by: Xin B Li <xin.b.li@intel.com>
# 
# tools/libxc/xc_linux_build.c
#   2005/06/23 16:10:11-04:00 jnakajim@build64.(none) +8 -9
#   Use 32-bit index for Phys->Mach map.
# 
# linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S
#   2005/06/23 15:48:31-04:00 jnakajim@build64.(none) +1 -1
#   Fixing the base address.
# 
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S	2005-06-23 16:12:28 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S	2005-06-23 16:12:28 -04:00
@@ -16,7 +16,7 @@
 #include <linux/linkage.h>
 
 .section __xen_guest
-	.ascii	"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xffffffff80100000"
+	.ascii	"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=3.0,VIRT_BASE=0xffffffff80000000"
 	.ascii	",LOADER=generic"
 /*	.ascii	",PT_MODE_WRITABLE" */
 	.byte	0
diff -Nru a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c
--- a/tools/libxc/xc_linux_build.c	2005-06-23 16:12:28 -04:00
+++ b/tools/libxc/xc_linux_build.c	2005-06-23 16:12:28 -04:00
@@ -81,8 +80,8 @@
     int rc;
 
     unsigned long nr_pt_pages;
-    unsigned long ppt_alloc;
-    unsigned long *physmap, *physmap_e, physmap_pfn;
+    unsigned long ppt_alloc, physmap_pfn;
+    u32 *physmap, *physmap_e;
 
     struct load_funcs load_funcs;
     struct domain_setup_info dsi;