[REPOST PATCH] kexec: Remove the unnecessary conditional judgement to simplify the code logic

[Simon Horman]

On Tue, Jul 28, 2015 at 12:46:42PM +0800, Minfei Huang wrote:
> Transforming PFN(Page Frame Number) to struct page is never failure, so
> we can simplify the code logic to do the image->control_page assignment
> directly in the loop, and remove the unnecessary conditional judgement.
> 
> Signed-off-by: Minfei Huang <mnfhuang at gmail.com>
> Acked-by: Dave Young <dyoung at redhat.com>
> Acked-by: Vivek Goyal <vgoyal at redhat.com>

Andrew, could you consider picking this up.
It seems to have been sufficiently reviewed, acked, etc...

> ---
>  kernel/kexec.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/kernel/kexec.c b/kernel/kexec.c
> index 6f1ed75..cf82474 100644
> --- a/kernel/kexec.c
> +++ b/kernel/kexec.c
> @@ -807,11 +807,10 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
>  		/* If I don't overlap any segments I have found my hole! */
>  		if (i == image->nr_segments) {
>  			pages = pfn_to_page(hole_start >> PAGE_SHIFT);
> +			image->control_page = hole_end;
>  			break;
>  		}
>  	}
> -	if (pages)
> -		image->control_page = hole_end;
>  
>  	return pages;
>  }
> -- 
> 2.4.0
> 
> 
> _______________________________________________
> kexec mailing list
> kexec at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec
>