From 9e63fdbdc75f2bcabd71248f73b1e8276a18a2d4 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 30 Nov 2009 11:48:36 +0000 Subject: [PATCH] x86: Remove redundant tests in __start_xen() Signed-off-by: Xiao Guangrong --- xen/arch/x86/setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 98249807bc..7615546cc3 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -758,7 +758,7 @@ void __init __start_xen(unsigned long mbi_p) #endif /* Is the region suitable for relocating the multiboot modules? */ - if ( !initial_images_start && (s < e) && + if ( !initial_images_start && ((e-s) >= (modules_length+modules_headroom)) ) { initial_images_end = e; @@ -776,8 +776,7 @@ void __init __start_xen(unsigned long mbi_p) } } - if ( !kexec_crash_area.start && (s < e) && - ((e-s) >= kexec_crash_area.size) ) + if ( !kexec_crash_area.start && ((e-s) >= kexec_crash_area.size) ) { e = (e - kexec_crash_area.size) & PAGE_MASK; kexec_crash_area.start = e; -- 2.30.2