From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751943AbdGRKue (ORCPT ); Tue, 18 Jul 2017 06:50:34 -0400 Received: from terminus.zytor.com ([65.50.211.136]:43373 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751915AbdGRKua (ORCPT ); Tue, 18 Jul 2017 06:50:30 -0400 Date: Tue, 18 Jul 2017 03:45:56 -0700 From: tip-bot for Baoquan He Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, bhe@redhat.com, torvalds@linux-foundation.org, keescook@chromium.org Reply-To: bhe@redhat.com, keescook@chromium.org, torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <1499603862-11516-4-git-send-email-bhe@redhat.com> References: <1499603862-11516-4-git-send-email-bhe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/boot/KASLR: Rename process_e820_entry() into process_mem_region() Git-Commit-ID: 27aac20574110abfd594175a668dc58b23b2b14a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 27aac20574110abfd594175a668dc58b23b2b14a Gitweb: http://git.kernel.org/tip/27aac20574110abfd594175a668dc58b23b2b14a Author: Baoquan He AuthorDate: Sun, 9 Jul 2017 20:37:41 +0800 Committer: Ingo Molnar CommitDate: Tue, 18 Jul 2017 11:11:12 +0200 x86/boot/KASLR: Rename process_e820_entry() into process_mem_region() Now process_e820_entry() is not limited to e820 entry processing, rename it to process_mem_region(). And adjust the code comment accordingly. Signed-off-by: Baoquan He Acked-by: Kees Cook Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: fanc.fnst@cn.fujitsu.com Cc: izumi.taku@jp.fujitsu.com Cc: matt@codeblueprint.co.uk Cc: thgarnie@google.com Link: http://lkml.kernel.org/r/1499603862-11516-4-git-send-email-bhe@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/boot/compressed/kaslr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index 36ff9f7..99c7194f 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -479,7 +479,7 @@ static unsigned long slots_fetch_random(void) return 0; } -static void process_e820_entry(struct mem_vector *entry, +static void process_mem_region(struct mem_vector *entry, unsigned long minimum, unsigned long image_size) { @@ -517,7 +517,7 @@ static void process_e820_entry(struct mem_vector *entry, /* Potentially raise address to meet alignment needs. */ region.start = ALIGN(region.start, CONFIG_PHYSICAL_ALIGN); - /* Did we raise the address above this e820 region? */ + /* Did we raise the address above the passed in memory entry? */ if (region.start > cur_entry.start + cur_entry.size) return; @@ -573,7 +573,7 @@ static void process_e820_entries(unsigned long minimum, continue; region.start = entry->addr; region.size = entry->size; - process_e820_entry(®ion, minimum, image_size); + process_mem_region(®ion, minimum, image_size); if (slot_area_index == MAX_SLOT_AREA) { debug_putstr("Aborted e820 scan (slot_areas full)!\n"); break;