[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] [XEN][POWERPC] Fix systemsim-gpul failure to boot
# HG changeset patch # User Jimi Xenidis <jimix@xxxxxxxxxxxxxx> # Node ID 3d7759a9247f45445619348a69e32167ceafedf5 # Parent 3d93083e393404c4d5459bc44fb6bb1603d1a042 [XEN][POWERPC] Fix systemsim-gpul failure to boot This patch fixes the fencepost error and adds a check for the failure to initialize the allocator, which would have make Mark's FTB much easier to debug. This works for me on the public systemsim-gpul release. Signed-off-by: Amos Waterland <apw@xxxxxxxxxx> Also fixes Maple, was just getting luck. Signed-off-by: Jimi Xenidis <jimix@xxxxxxxxxxxxxx> Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx> --- xen/arch/powerpc/boot_of.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff -r 3d93083e3934 -r 3d7759a9247f xen/arch/powerpc/boot_of.c --- a/xen/arch/powerpc/boot_of.c Tue Dec 12 13:54:00 2006 -0600 +++ b/xen/arch/powerpc/boot_of.c Mon Dec 11 19:43:18 2006 -0500 @@ -608,7 +608,7 @@ static ulong boot_of_mem_init(void) if (size_cells == 2 && (r < l) ) size = (size << 32) | reg[r++]; - if (r >= l) + if (r > l) break; /* partial line. Skip */ boot_of_alloc_init(p, addr_cells, size_cells); @@ -1290,6 +1290,7 @@ multiboot_info_t __init *boot_of_init( { static multiboot_info_t mbi; void *oft; + int r; of_vec = vec; of_msr = orig_msr; @@ -1316,7 +1317,9 @@ multiboot_info_t __init *boot_of_init( of_printf("%s: _start %p _end %p 0x%lx\n", __func__, _start, _end, r6); boot_of_fix_maple(); - boot_of_mem_init(); + r = boot_of_mem_init(); + if (r == 0) + of_panic("failure to initialize memory allocator"); boot_of_bootargs(&mbi); oft = boot_of_module(r3, r4, &mbi); boot_of_cpus(); _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |