From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xiao Guangrong Subject: [PATCH] cleanup for __start_xen() Date: Mon, 30 Nov 2009 14:25:56 +0800 Message-ID: <4B136574.7010603@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Keir Fraser , "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org Remove repetitive judgment in __start_xen() Signed-off-by: Xiao Guangrong diff --git a/a/xen/arch/x86/setup.c b/b/xen/arch/x86/setup.c index d87d082..563e46a 100644 --- a/a/xen/arch/x86/setup.c +++ b/b/xen/arch/x86/setup.c @@ -729,7 +729,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; @@ -747,7 +747,7 @@ void __init __start_xen(unsigned long mbi_p) } } - if ( !kexec_crash_area.start && (s < e) && + if ( !kexec_crash_area.start && ((e-s) >= kexec_crash_area.size) ) { e = (e - kexec_crash_area.size) & PAGE_MASK;