# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1234348905 0
# Node ID 8d7a6bc2575dcaf1419281d05122f78e9a563115
# Parent  4ac8bc60c000500f7fa1aeccea708d2191f5f31a
x86_64: Ensure enough space for allocator bitmap after relocated Xen image.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff -r 4ac8bc60c000 -r 8d7a6bc2575d xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c	Tue Feb 10 05:51:00 2009 +0000
+++ b/xen/arch/x86/setup.c	Wed Feb 11 10:41:45 2009 +0000
@@ -642,7 +642,8 @@ void __init __start_xen(unsigned long mb
             s >> PAGE_SHIFT, (e-s) >> PAGE_SHIFT, PAGE_HYPERVISOR);
 
 #if defined(CONFIG_X86_64)
-#define reloc_size ((__pa(&_end) + mask) & ~mask)
+/* Relocate Xen image, allocation bitmap, and one page of padding. */
+#define reloc_size ((__pa(&_end) + max_page/8 + PAGE_SIZE + mask) & ~mask)
         /* Is the region suitable for relocating Xen? */
         if ( !xen_phys_start && ((e-s) >= reloc_size) )
         {