From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751146AbdALVkj (ORCPT <rfc822;w@1wt.eu>);
        Thu, 12 Jan 2017 16:40:39 -0500
Received: from mx1.redhat.com ([209.132.183.28]:51406 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750990AbdALVki (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 12 Jan 2017 16:40:38 -0500
Date: Fri, 13 Jan 2017 05:40:29 +0800
From: Dave Young <dyoung@redhat.com>
To: Nicolai Stange <nicstange@gmail.com>
Cc: Matt Fleming <matt@codeblueprint.co.uk>,
        Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-efi@vger.kernel.org,
        linux-kernel@vger.kernel.org, x86@kernel.org,
        Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
        hpa@zytor.com, Dan Williams <dan.j.williams@intel.com>,
        mika.penttila@nextfour.com, bhsharma@redhat.com
Subject: Re: [PATCH 3/4] efi/x86: move efi_print_memmap to
 drivers/firmware/efi/memmap.c
Message-ID: <20170112214029.GE2709@dhcp-128-65.nay.redhat.com>
References: <20170112094118.815108042@redhat.com>
 <20170112094214.964092881@redhat.com>
 <87wpe0o50c.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87wpe0o50c.fsf@gmail.com>
User-Agent: Mutt/1.7.1 (2016-10-04)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 12 Jan 2017 21:40:38 +0000 (UTC)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 01/12/17 at 01:08pm, Nicolai Stange wrote:
> On Thu, Jan 12 2017, Dave Young wrote:
> 
> > Signed-off-by: Dave Young <dyoung@redhat.com>
> > ---
> >  arch/x86/platform/efi/efi.c   |   16 ----------------
> >  drivers/firmware/efi/memmap.c |   16 ++++++++++++++++
> >  2 files changed, 16 insertions(+), 16 deletions(-)
> >
> > --- linux-x86.orig/arch/x86/platform/efi/efi.c
> > +++ linux-x86/arch/x86/platform/efi/efi.c
> > @@ -210,22 +210,6 @@ int __init efi_memblock_x86_reserve_rang
> >  	return 0;
> >  }
> >  
> > -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 <linux/io.h>
> >  #include <asm/early_ioremap.h>
> >  
> > +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
> 
> Shouldn't the declaration in arch/x86/include/asm/efi.h get moved as well?

Good catch, will change it as well

Thanks
Dave