Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754469AbbG1Erk (ORCPT ); Tue, 28 Jul 2015 00:47:40 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:34233 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753551AbbG1Eri (ORCPT ); Tue, 28 Jul 2015 00:47:38 -0400 From: Minfei Huang To: akpm@linux-foundation.org, vgoyal@redhat.com, ebiederm@xmission.com Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Minfei Huang Subject: [REPOST PATCH] kexec: Remove the unnecessary conditional judgement to simplify the code logic Date: Tue, 28 Jul 2015 12:46:42 +0800 Message-Id: <1438058802-6462-1-git-send-email-mnfhuang@gmail.com> X-Mailer: git-send-email 2.4.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1169 Lines: 36 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 Acked-by: Dave Young Acked-by: Vivek Goyal --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/