Commit 103e2063 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/boot/e820: Rename default_machine_specific_memory_setup() to e820__memory_setup_default() 



The default_machine_specific_memory_setup() is a mouthful and despite the
many words it doesn't actually tell us clearly what it does.

The function is the x86 legacy memory layout setup code, based on
E820-formatted memory layout information passed by the bootloader
via the boot_params.

Rename it to e820__memory_setup_default() to better signal its purpose.

Also rename the related higher level function to be consistent with
this new naming:

    setup_memory_map() => e820__memory_setup()

No change in functionality.

Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bf495573

arch/x86/include/asm/e820/api.h

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ extern void memblock_find_dma_reserve(void); 
extern void finish_e820_parsing(void);

extern void e820_reserve_resources(void);

extern void e820_reserve_resources_late(void);

extern void setup_memory_map(void);

extern char *default_machine_specific_memory_setup(void);

extern void e820__memory_setup(void);

extern char *e820__memory_setup_default(void);

extern void e820_reallocate_tables(void);

extern void e820_mark_nosave_regions(unsigned long limit_pfn);

arch/x86/kernel/e820.c

+7 −2
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ void __init e820_reserve_resources_late(void) 
	}

}



char *__init default_machine_specific_memory_setup(void)

char *__init e820__memory_setup_default(void)

{

	char *who = "BIOS-e820";

	u32 new_nr;
@@ -1135,7 +1135,12 @@ char *__init default_machine_specific_memory_setup(void) 
	return who;

}



void __init setup_memory_map(void)

/*

 * Calls e820__memory_setup_default() in essence to pick up the firmware/bootloader

 * E820 map - with an optional platform quirk available for virtual platforms

 * to override this method of boot environment processing:

 */

void __init e820__memory_setup(void)

{

	char *who;

arch/x86/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ void __init setup_arch(char **cmdline_p) 
	x86_init.oem.arch_setup();



	iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) - 1;

	setup_memory_map();

	e820__memory_setup();

	parse_setup_data();



	copy_edd();

arch/x86/kernel/x86_init.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct x86_init_ops x86_init __initdata = { 
	.resources = {

		.probe_roms		= probe_roms,

		.reserve_resources	= reserve_standard_io_resources,

		.memory_setup		= default_machine_specific_memory_setup,

		.memory_setup		= e820__memory_setup_default,

	},



	.mpparse = {