diff -rN -u -p old-xen-pae/xen/arch/x86/domain_build.c new-xen-pae/xen/arch/x86/domain_build.c
--- old-xen-pae/xen/arch/x86/domain_build.c	2005-08-01 21:06:42.000000000 +0000
+++ new-xen-pae/xen/arch/x86/domain_build.c	2005-08-05 17:48:07.000000000 +0000
@@ -78,8 +78,8 @@ int construct_dom0(struct domain *d,
     unsigned long pfn, mfn;
     unsigned long nr_pages;
     unsigned long nr_pt_pages;
-    unsigned long alloc_start;
-    unsigned long alloc_end;
+    physaddr_t alloc_start;
+    physaddr_t alloc_end;
     unsigned long count;
     struct pfn_info *page = NULL;
     start_info_t *si;
@@ -219,8 +219,8 @@ int construct_dom0(struct domain *d,
         panic("Insufficient contiguous RAM to build kernel image.\n");
 
     printk("PHYSICAL MEMORY ARRANGEMENT:\n"
-           " Dom0 alloc.:   %p->%p",
-           _p(alloc_start), _p(alloc_end));
+           " Dom0 alloc.:   %llx->%llx",
+           (u64)alloc_start, (u64)alloc_end);
     if ( d->tot_pages < nr_pages )
         printk(" (%lu pages to be allocated)",
                nr_pages - d->tot_pages);
diff -rN -u -p old-xen-pae/xen/include/asm-x86/io.h new-xen-pae/xen/include/asm-x86/io.h
--- old-xen-pae/xen/include/asm-x86/io.h	2005-07-19 18:51:39.000000000 +0000
+++ new-xen-pae/xen/include/asm-x86/io.h	2005-08-05 17:45:17.000000000 +0000
@@ -45,7 +45,7 @@ static inline void * phys_to_virt(unsign
 /*
  * Change "struct pfn_info" to physical address.
  */
-#ifdef CONFIG_HIGHMEM64G
+#ifdef CONFIG_TARGET_X86_PAE
 #define page_to_phys(page)  ((u64)(page - frame_table) << PAGE_SHIFT)
 #else
 #define page_to_phys(page)  ((page - frame_table) << PAGE_SHIFT)