Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27aac205 authored by Baoquan He's avatar Baoquan He Committed by Ingo Molnar
Browse files

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: default avatarBaoquan He <bhe@redhat.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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: default avatarIngo Molnar <mingo@kernel.org>
parent 87891b01

arch/x86/boot/compressed/kaslr.c

+3 −3
Original line number Diff line number Diff line
@@ -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(&region, minimum, image_size);

		process_mem_region(&region, minimum, image_size);

		if (slot_area_index == MAX_SLOT_AREA) {

			debug_putstr("Aborted e820 scan (slot_areas full)!\n");

			break;