Also clean it up a bit. No change in functionality.
Cc: Alex Thorlton <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Dan Williams <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Huang, Ying <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Juergen Gross <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Paul Jackson <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Wei Yang <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: [email protected] Signed-off-by: Ingo Molnar <[email protected]> --- arch/x86/include/asm/e820/api.h | 4 ++-- arch/x86/kernel/e820.c | 11 +++++++++-- arch/x86/kernel/setup.c | 3 +-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h index 7d5dfc2f9e91..fae7f3e11d9a 100644 --- a/arch/x86/include/asm/e820/api.h +++ b/arch/x86/include/asm/e820/api.h @@ -22,10 +22,10 @@ extern void e820__update_table_print(void); extern unsigned long e820_end_of_ram_pfn(void); extern unsigned long e820_end_of_low_ram_pfn(void); -extern u64 e820__memblock_alloc_reserved(u64 sizet, u64 align); +extern u64 e820__memblock_alloc_reserved(u64 size, u64 align); extern void e820__memblock_setup(void); -extern void e820_reserve_setup_data(void); +extern void e820__reserve_setup_data(void); extern void e820__finish_early_params(void); extern void e820_reserve_resources(void); extern void e820_reserve_resources_late(void); diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 7dc430c03acb..114625890337 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -922,7 +922,12 @@ static int __init parse_memmap_opt(char *str) } early_param("memmap", parse_memmap_opt); -void __init e820_reserve_setup_data(void) +/* + * Reserve all entries from the bootloader's extensible data nodes list, + * because if present we are going to use it later on to fetch e820 + * entries from it: + */ +void __init e820__reserve_setup_data(void) { struct setup_data *data; u64 pa_data; @@ -939,8 +944,10 @@ void __init e820_reserve_setup_data(void) } e820__update_table(e820_table); + memcpy(e820_table_firmware, e820_table, sizeof(*e820_table_firmware)); - printk(KERN_INFO "extended physical RAM map:\n"); + + pr_info("extended physical RAM map:\n"); e820__print_table("reserve setup_data"); } diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index acb2db02ec81..4ac8ae8a7573 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1003,8 +1003,7 @@ void __init setup_arch(char **cmdline_p) early_dump_pci_devices(); #endif - /* update the e820_table_firmware too */ - e820_reserve_setup_data(); + e820__reserve_setup_data(); e820__finish_early_params(); if (efi_enabled(EFI_BOOT)) -- 2.7.4
