diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2009-07-09 08:52:31 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2009-07-09 08:52:31 +0100 |
| commit | 6edab9fe64689945d4c8124442b76ae7d09406f8 (patch) | |
| tree | a07e5a1b53dff45e00bbdb2c754329e67be84256 | |
| parent | 0409e29e2bd9ff5e30cb0bfe5ba49b7aed19ae5e (diff) | |
| download | xen-6edab9fe64689945d4c8124442b76ae7d09406f8.tar.gz xen-6edab9fe64689945d4c8124442b76ae7d09406f8.tar.bz2 xen-6edab9fe64689945d4c8124442b76ae7d09406f8.zip | |
x86_64: Fix Xen relocation size -- there is no longer an allocation
bitmap to account for.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| -rw-r--r-- | xen/arch/x86/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 0793a74a85..b7966dfd63 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -646,8 +646,7 @@ void __init __start_xen(unsigned long mbi_p) 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) ) { |