From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Fleming Subject: Re: [PATCH 2/6] x86/efi: use efi_memory_descriptor in convenience functions Date: Fri, 19 Sep 2014 12:04:12 +0100 Message-ID: <20140919110412.GF18635@console-pimps.org> References: <1410633376-8822-1-git-send-email-ricardo.neri-calderon@linux.intel.com> <1410633376-8822-3-git-send-email-ricardo.neri-calderon@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1410633376-8822-3-git-send-email-ricardo.neri-calderon-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Ricardo Neri Cc: Matt Fleming , "H. Peter Anvin" , linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "Glenn P. Williamson" List-Id: linux-efi@vger.kernel.org On Sat, 13 Sep, at 11:36:12AM, Ricardo Neri wrote: > diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c > index 64ecbb5..29c85fe 100644 > --- a/drivers/firmware/efi/efi.c > +++ b/drivers/firmware/efi/efi.c > @@ -206,29 +206,23 @@ subsys_initcall(efisubsys_init); > */ > void __iomem *efi_lookup_mapped_addr(u64 phys_addr) > { > - struct efi_memory_map *map; > - void *p; > - map =3D efi.memmap; > - if (!map) > + efi_memory_desc_t *md; > + > + md =3D efi_memory_descriptor(phys_addr); Whoops. This change is causing the following build errors on ia64, /home/build/git/efi/arch/ia64/kernel/efi.c:722:1: error: static declara= tion of =E2=80=98efi_memory_descriptor=E2=80=99 follows non-static decl= aration efi_memory_descriptor (unsigned long phys_addr) ^ In file included from /home/build/git/efi/arch/ia64/kernel/efi.c:32:0: /home/build/git/efi/include/linux/efi.h:870:27: note: previous declarat= ion of =E2=80=98efi_memory_descriptor=E2=80=99 was here extern efi_memory_desc_t *efi_memory_descriptor(unsigned long phys_add= r); ^ and on arm64... drivers/built-in.o: In function `efi_lookup_mapped_addr': :(.text+0xb0e0): undefined reference to `efi_memory_descriptor' --=20 Matt Fleming, Intel Open Source Technology Center From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755530AbaISLES (ORCPT ); Fri, 19 Sep 2014 07:04:18 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:38480 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751251AbaISLEQ (ORCPT ); Fri, 19 Sep 2014 07:04:16 -0400 Date: Fri, 19 Sep 2014 12:04:12 +0100 From: Matt Fleming To: Ricardo Neri Cc: Matt Fleming , "H. Peter Anvin" , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, "Glenn P. Williamson" Subject: Re: [PATCH 2/6] x86/efi: use efi_memory_descriptor in convenience functions Message-ID: <20140919110412.GF18635@console-pimps.org> References: <1410633376-8822-1-git-send-email-ricardo.neri-calderon@linux.intel.com> <1410633376-8822-3-git-send-email-ricardo.neri-calderon@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1410633376-8822-3-git-send-email-ricardo.neri-calderon@linux.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 13 Sep, at 11:36:12AM, Ricardo Neri wrote: > diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c > index 64ecbb5..29c85fe 100644 > --- a/drivers/firmware/efi/efi.c > +++ b/drivers/firmware/efi/efi.c > @@ -206,29 +206,23 @@ subsys_initcall(efisubsys_init); > */ > void __iomem *efi_lookup_mapped_addr(u64 phys_addr) > { > - struct efi_memory_map *map; > - void *p; > - map = efi.memmap; > - if (!map) > + efi_memory_desc_t *md; > + > + md = efi_memory_descriptor(phys_addr); Whoops. This change is causing the following build errors on ia64, /home/build/git/efi/arch/ia64/kernel/efi.c:722:1: error: static declaration of ‘efi_memory_descriptor’ follows non-static declaration efi_memory_descriptor (unsigned long phys_addr) ^ In file included from /home/build/git/efi/arch/ia64/kernel/efi.c:32:0: /home/build/git/efi/include/linux/efi.h:870:27: note: previous declaration of ‘efi_memory_descriptor’ was here extern efi_memory_desc_t *efi_memory_descriptor(unsigned long phys_addr); ^ and on arm64... drivers/built-in.o: In function `efi_lookup_mapped_addr': :(.text+0xb0e0): undefined reference to `efi_memory_descriptor' -- Matt Fleming, Intel Open Source Technology Center