From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752738AbdA1WXe (ORCPT ); Sat, 28 Jan 2017 17:23:34 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36171 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752538AbdA1WUA (ORCPT ); Sat, 28 Jan 2017 17:20:00 -0500 From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Andy Lutomirski , Borislav Petkov , "H . Peter Anvin" , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Yinghai Lu Subject: [PATCH 45/50] x86/boot/e820: Document e820__reserve_setup_data() Date: Sat, 28 Jan 2017 23:12:06 +0100 Message-Id: <1485641531-22124-46-git-send-email-mingo@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485641531-22124-1-git-send-email-mingo@kernel.org> References: <1485641531-22124-1-git-send-email-mingo@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Also clean it up a bit. No change in functionality. Cc: Alex Thorlton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dan Williams Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Huang, Ying Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Linus Torvalds Cc: Paul Jackson Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Tejun Heo Cc: Thomas Gleixner Cc: Wei Yang Cc: Yinghai Lu Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar --- 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