[LINUX][PAE] Fix e820 setup for PAE guests: preserve high-order bits of max_pfn.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h
index 18a2a6c140f3d65eb7b3d63cc2f72b0e3d2e2903..1b678d12f68b7b1d1cbf8c3ba611dab74dc60f37 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h
@@ -25,9 +25,9 @@ static char * __init machine_specific_memory_setup(void)
        if ( rc == -ENOSYS ) {
                memmap.nr_entries = 1;
                map[0].addr = 0ULL;
-               map[0].size = xen_start_info->nr_pages << PAGE_SHIFT;
+               map[0].size = PFN_PHYS(xen_start_info->nr_pages);
                /* 8MB slack (to balance backend allocations). */
-               map[0].size += 8 << 20;
+               map[0].size += 8ULL << 20;
                map[0].type = E820_RAM;
                rc = 0;
        }