diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2009-07-08 22:08:31 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2009-07-08 22:08:31 +0100 |
commit | 0409e29e2bd9ff5e30cb0bfe5ba49b7aed19ae5e (patch) | |
tree | acc735e24d46926ec3258b2a658fb2cd9ef66c54 /xen/arch/x86/tboot.c | |
parent | 4d5b3e46f1afbe993af97f96e3abd69162faeeeb (diff) | |
download | xen-0409e29e2bd9ff5e30cb0bfe5ba49b7aed19ae5e.tar.gz xen-0409e29e2bd9ff5e30cb0bfe5ba49b7aed19ae5e.tar.bz2 xen-0409e29e2bd9ff5e30cb0bfe5ba49b7aed19ae5e.zip |
Replace boot-time free-pages bitmap with a region list.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/arch/x86/tboot.c')
-rw-r--r-- | xen/arch/x86/tboot.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index 9709553e4f..17f6147def 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -47,7 +47,6 @@ static uint64_t sinit_base, sinit_size; #define TXTCR_HEAP_SIZE 0x0308 extern char __init_begin[], __per_cpu_start[], __bss_start[]; -extern unsigned long allocator_bitmap_end; #define SHA1_SIZE 20 typedef uint8_t sha1_hash_t[SHA1_SIZE]; @@ -299,7 +298,7 @@ void tboot_shutdown(uint32_t shutdown_type) /* * Xen regions for tboot to MAC */ - g_tboot_shared->num_mac_regions = 5; + g_tboot_shared->num_mac_regions = 4; /* S3 resume code (and other real mode trampoline code) */ g_tboot_shared->mac_regions[0].start = bootsym_phys(trampoline_start); g_tboot_shared->mac_regions[0].size = bootsym_phys(trampoline_end) - @@ -315,10 +314,6 @@ void tboot_shutdown(uint32_t shutdown_type) /* bss */ g_tboot_shared->mac_regions[3].start = (uint64_t)__pa(&__bss_start); g_tboot_shared->mac_regions[3].size = __pa(&_end) - __pa(&__bss_start); - /* boot allocator bitmap */ - g_tboot_shared->mac_regions[4].start = (uint64_t)__pa(&_end); - g_tboot_shared->mac_regions[4].size = allocator_bitmap_end - - __pa(&_end); /* * MAC domains and other Xen memory |