From: Keir Fraser Date: Mon, 30 Nov 2009 11:48:36 +0000 (+0000) Subject: x86: Remove redundant tests in __start_xen() X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13019 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9e63fdbdc75f2bcabd71248f73b1e8276a18a2d4;p=xen.git x86: Remove redundant tests in __start_xen() Signed-off-by: Xiao Guangrong --- 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;