From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751652AbdAPCx0 (ORCPT ); Sun, 15 Jan 2017 21:53:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41316 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751605AbdAPCxW (ORCPT ); Sun, 15 Jan 2017 21:53:22 -0500 Message-Id: <20170116025026.486040805@redhat.com> User-Agent: quilt/0.65 Date: Mon, 16 Jan 2017 10:45:56 +0800 From: Dave Young To: Matt Fleming , Ard Biesheuvel Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, dyoung@redhat.com, x86@kernel.org, Nicolai Stange , Ingo Molnar , Thomas Gleixner , hpa@zytor.com, Dan Williams , mika.penttila@nextfour.com, bhsharma@redhat.com Subject: [PATCH V2 2/4] efi/x86: move efi_print_memmap to drivers/firmware/efi/memmap.c References: <20170116024554.461236678@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=efi-add-print-memmap.patch X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 16 Jan 2017 02:53:18 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Dave Young --- v1->v2: move efi_print_memmap declaration to general header file arch/x86/include/asm/efi.h | 1 - arch/x86/platform/efi/efi.c | 16 ---------------- drivers/firmware/efi/memmap.c | 16 ++++++++++++++++ include/linux/efi.h | 1 + 4 files changed, 17 insertions(+), 17 deletions(-) --- linux-x86.orig/arch/x86/platform/efi/efi.c +++ linux-x86/arch/x86/platform/efi/efi.c @@ -278,22 +278,6 @@ static void __init efi_clean_memmap(void } } -void __init efi_print_memmap(void) -{ - efi_memory_desc_t *md; - int i = 0; - - for_each_efi_memory_desc(md) { - char buf[64]; - - pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%lluMB)\n", - i++, efi_md_typeattr_format(buf, sizeof(buf), md), - md->phys_addr, - md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1, - (md->num_pages >> (20 - EFI_PAGE_SHIFT))); - } -} - static int __init efi_systab_init(void *phys) { if (efi_enabled(EFI_64BIT)) { --- linux-x86.orig/drivers/firmware/efi/memmap.c +++ linux-x86/drivers/firmware/efi/memmap.c @@ -10,6 +10,22 @@ #include #include +void __init efi_print_memmap(void) +{ + efi_memory_desc_t *md; + int i = 0; + + for_each_efi_memory_desc(md) { + char buf[64]; + + pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%lluMB)\n", + i++, efi_md_typeattr_format(buf, sizeof(buf), md), + md->phys_addr, + md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1, + (md->num_pages >> (20 - EFI_PAGE_SHIFT))); + } +} + /** * __efi_memmap_init - Common code for mapping the EFI memory map * @data: EFI memory map data --- linux-x86.orig/arch/x86/include/asm/efi.h +++ linux-x86/arch/x86/include/asm/efi.h @@ -116,7 +116,6 @@ extern void __init efi_set_executable(ef extern int __init efi_memblock_x86_reserve_range(void); extern pgd_t * __init efi_call_phys_prolog(void); extern void __init efi_call_phys_epilog(pgd_t *save_pgd); -extern void __init efi_print_memmap(void); extern void __init efi_memory_uc(u64 addr, unsigned long size); extern void __init efi_map_region(efi_memory_desc_t *md); extern void __init efi_map_region_fixed(efi_memory_desc_t *md); --- linux-x86.orig/include/linux/efi.h +++ linux-x86/include/linux/efi.h @@ -949,6 +949,7 @@ static inline efi_status_t efi_query_var return EFI_SUCCESS; } #endif +extern void __init efi_print_memmap(void); extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr); extern int __init efi_memmap_init_early(struct efi_memory_map_data *data);