# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1233191510 0
# Node ID 3449d8e50fb92c1477feab5e8703c8ddf6f08596
# Parent 0858f961c77a4ef463d061a9f06e4f83ee95399f
x86: Do not check dom0 kernel header for bzimage magic until we are
sure it is mapped. This fixes a crash when running on top of tboot.
Signed-off-by: Joseph Cihula <joseph.cihula@xxxxxxxxx>
---
xen/arch/x86/setup.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff -r 0858f961c77a -r 3449d8e50fb9 xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c Wed Jan 28 17:40:01 2009 +0000
+++ b/xen/arch/x86/setup.c Thu Jan 29 01:11:50 2009 +0000
@@ -417,7 +417,7 @@ void __init __start_xen(unsigned long mb
unsigned int initrdidx = 1;
multiboot_info_t *mbi = __va(mbi_p);
module_t *mod = (module_t *)__va(mbi->mods_addr);
- unsigned long nr_pages, modules_length, modules_headroom;
+ unsigned long nr_pages, modules_length, modules_headroom = -1;
unsigned long allocator_bitmap_end;
int i, e820_warn = 0, bytes = 0;
struct ns16550_defaults ns16550 = {
@@ -617,9 +617,6 @@ void __init __start_xen(unsigned long mb
* x86/64, we relocate Xen to higher memory.
*/
modules_length = mod[mbi->mods_count-1].mod_end - mod[0].mod_start;
- modules_headroom = bzimage_headroom(
- (char *)(unsigned long)mod[0].mod_start,
- (unsigned long)(mod[0].mod_end - mod[0].mod_start));
for ( i = boot_e820.nr_map-1; i >= 0; i-- )
{
@@ -724,6 +721,11 @@ void __init __start_xen(unsigned long mb
}
#endif
+ if ( modules_headroom == -1 )
+ modules_headroom = bzimage_headroom(
+ (char *)(unsigned long)mod[0].mod_start,
+ (unsigned long)(mod[0].mod_end - mod[0].mod_start));
+
/* Is the region suitable for relocating the multiboot modules? */
if ( !initial_images_start && (s < e) &&
((e-s) >= (modules_length+modules_headroom)) )
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home