ia64/xen-unstable

changeset 19190:8d7a6bc2575d

x86_64: Ensure enough space for allocator bitmap after relocated Xen image.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Feb 11 10:41:45 2009 +0000 (2009-02-11)
parents 4ac8bc60c000
children a55919061d79
files xen/arch/x86/setup.c
line diff
     1.1 --- a/xen/arch/x86/setup.c	Tue Feb 10 05:51:00 2009 +0000
     1.2 +++ b/xen/arch/x86/setup.c	Wed Feb 11 10:41:45 2009 +0000
     1.3 @@ -642,7 +642,8 @@ void __init __start_xen(unsigned long mb
     1.4              s >> PAGE_SHIFT, (e-s) >> PAGE_SHIFT, PAGE_HYPERVISOR);
     1.5  
     1.6  #if defined(CONFIG_X86_64)
     1.7 -#define reloc_size ((__pa(&_end) + mask) & ~mask)
     1.8 +/* Relocate Xen image, allocation bitmap, and one page of padding. */
     1.9 +#define reloc_size ((__pa(&_end) + max_page/8 + PAGE_SIZE + mask) & ~mask)
    1.10          /* Is the region suitable for relocating Xen? */
    1.11          if ( !xen_phys_start && ((e-s) >= reloc_size) )
    1.12          {