[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] Revert 20523:bd52fff29e6e "Remove redundant tests in __start_xen()"
# HG changeset patch # User Keir Fraser <keir.fraser@xxxxxxxxxx> # Date 1259674791 0 # Node ID 89f7f1d31d4b0da4123caa81ca9cfc47afe153dd # Parent a006e510999130d5f6a7ad36e19e2d7d1b7486eb Revert 20523:bd52fff29e6e "Remove redundant tests in __start_xen()" Consensus is that code is clearer with the tests, even though they are redundant. Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx> --- xen/arch/x86/setup.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff -r a006e5109991 -r 89f7f1d31d4b xen/arch/x86/setup.c --- a/xen/arch/x86/setup.c Tue Dec 01 13:38:18 2009 +0000 +++ b/xen/arch/x86/setup.c Tue Dec 01 13:39:51 2009 +0000 @@ -758,7 +758,7 @@ void __init __start_xen(unsigned long mb #endif /* Is the region suitable for relocating the multiboot modules? */ - if ( !initial_images_start && + if ( !initial_images_start && (s < e) && ((e-s) >= (modules_length+modules_headroom)) ) { initial_images_end = e; @@ -776,7 +776,8 @@ void __init __start_xen(unsigned long mb } } - if ( !kexec_crash_area.start && ((e-s) >= kexec_crash_area.size) ) + if ( !kexec_crash_area.start && (s < e) && + ((e-s) >= kexec_crash_area.size) ) { e = (e - kexec_crash_area.size) & PAGE_MASK; kexec_crash_area.start = e; _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |