The following commit has been merged into the x86/kaslr branch of tip: Commit-ID: ef7b07d59e2f18042622cecde0c7a89b60f33a89 Gitweb: https://git.kernel.org/tip/ef7b07d59e2f18042622cecde0c7a89b60f33a89 Author: Arvind Sankar <nived...@alum.mit.edu> AuthorDate: Tue, 28 Jul 2020 18:57:09 -04:00 Committer: Ingo Molnar <mi...@kernel.org> CommitterDate: Fri, 31 Jul 2020 11:08:17 +02:00
x86/kaslr: Drop redundant variable in __process_mem_region() region.size can be trimmed to store the portion of the region before the overlap, instead of a separate mem_vector variable. Signed-off-by: Arvind Sankar <nived...@alum.mit.edu> Signed-off-by: Ingo Molnar <mi...@kernel.org> Link: https://lore.kernel.org/r/20200728225722.67457-9-nived...@alum.mit.edu --- arch/x86/boot/compressed/kaslr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index e978c35..8cc47fa 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -664,11 +664,8 @@ static void __process_mem_region(struct mem_vector *entry, /* Store beginning of region if holds at least image_size. */ if (overlap.start >= region.start + image_size) { - struct mem_vector beginning; - - beginning.start = region.start; - beginning.size = overlap.start - region.start; - process_gb_huge_pages(&beginning, image_size); + region.size = overlap.start - region.start; + process_gb_huge_pages(®ion, image_size); } /* Return if overlap extends to or past end of region. */
