From: kaf24@firebug.cl.cam.ac.uk Date: Thu, 15 Jun 2006 12:30:35 +0000 (+0100) Subject: [LINUX][PAE] Fix e820 setup for PAE guests: preserve high-order bits of max_pfn. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15955^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1bf1344c7ca70b2e47a059fedf131b09bfab1c09;p=xen.git [LINUX][PAE] Fix e820 setup for PAE guests: preserve high-order bits of max_pfn. Signed-off-by: Keir Fraser --- 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 18a2a6c140..1b678d12f6 100644 --- 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; }