[Xen-changelog] [xen-unstable] x86_64: Fix Xen relocation size -- there is no longer an allocation

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1247125951 -3600
# Node ID 4b6e4bb7b7b4234a18bde167853d9cadb6172e5d
# Parent  d6c1d7992f437c625135c2f8752fc94078ec4c31
x86_64: Fix Xen relocation size -- there is no longer an allocation
bitmap to account for.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/setup.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -r d6c1d7992f43 -r 4b6e4bb7b7b4 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      Wed Jul 08 22:08:31 2009 +0100
+++ b/xen/arch/x86/setup.c      Thu Jul 09 08:52:31 2009 +0100
@@ -646,8 +646,7 @@ void __init __start_xen(unsigned long mb
             s >> PAGE_SHIFT, (e-s) >> PAGE_SHIFT, PAGE_HYPERVISOR);
 
 #if defined(CONFIG_X86_64)
-/* Relocate Xen image, allocation bitmap, and one page of padding. */
-#define reloc_size ((__pa(&_end) + max_page/8 + PAGE_SIZE + mask) & ~mask)
+#define reloc_size ((__pa(&_end) + mask) & ~mask)
         /* Is the region suitable for relocating Xen? */
         if ( !xen_phys_start && ((e-s) >= reloc_size) )
         {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog