diff options
| -rw-r--r-- | arch/x86/include/asm/e820/api.h | 4 | ||||
| -rw-r--r-- | arch/x86/kernel/e820.c | 9 | ||||
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/x86_init.c | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h index 91a5c346f765..2a6de16ad9b5 100644 --- a/arch/x86/include/asm/e820/api.h +++ b/arch/x86/include/asm/e820/api.h @@ -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); diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 6d73ad46ab35..7d12433ad056 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -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; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index c2bb2d143d70..a8d0e388b358 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -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(); diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index 512cb45264d0..a088b2c47f73 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -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 = { |