Commit 04e9949b authored Sep 09, 2015 by Minfei Huang Committed by Linus Torvalds Sep 10, 2015

kexec: remove unnecessary test in kimage_alloc_crash_control_pages()



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@gmail.com>
Acked-by: Dave Young <dyoung@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Simon Horman <horms@verge.net.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2965faa5

kernel/kexec_core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -439,11 +439,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;
		}