From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757373AbcAJTjh (ORCPT ); Sun, 10 Jan 2016 14:39:37 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:52883 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757131AbcAJTjf (ORCPT ); Sun, 10 Jan 2016 14:39:35 -0500 Subject: Re: [PATCH -next] efi: Do not include asm/efi.h if not needed To: Ard Biesheuvel References: <1452440128-15134-1-git-send-email-linux@roeck-us.net> Cc: Matt Fleming , "linux-efi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Will Deacon From: Guenter Roeck Message-ID: <5692B375.2080600@roeck-us.net> Date: Sun, 10 Jan 2016 11:39:33 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/10/2016 09:31 AM, Ard Biesheuvel wrote: > On 10 January 2016 at 18:02, Ard Biesheuvel wrote: >> On 10 January 2016 at 16:35, Guenter Roeck wrote: >>> Commit f7d924894265 ("arm64/efi: refactor EFI init and runtime code >>> for reuse by 32-bit ARM") adds an include of asm/efi.h to efi.c. >>> This causes a build failure for ia64, where asm/efi.h does not exist. >>> >>> drivers/firmware/efi/efi.c:28:21: fatal error: >>> asm/efi.h: No such file or directory >>> >>> asm/efi.h does not define or declare anything used by efi.c, thus >>> including it should not be needed. >>> >>> Fixes: f7d924894265 ("arm64/efi: refactor EFI init and runtime code for reuse by 32-bit ARM") >>> Cc: Ard Biesheuvel >>> Cc: Will Deacon >>> Signed-off-by: Guenter Roeck >> >> This fixes ia64 but breaks ARM >> >> drivers/firmware/efi/efi.c: In function ‘efi_mem_desc_lookup’: >> drivers/firmware/efi/efi.c:291:3: error: implicit declaration of >> function ‘early_memremap’ [-Werror=implicit-function-declaration] >> drivers/firmware/efi/efi.c:291:6: warning: assignment makes pointer >> from integer without a cast [enabled by default] >> drivers/firmware/efi/efi.c:301:4: error: implicit declaration of >> function ‘early_memunmap’ [-Werror=implicit-function-declaration] >> drivers/firmware/efi/efi.c: In function ‘efi_config_parse_tables’: >> drivers/firmware/efi/efi.c:404:7: warning: assignment makes pointer >> from integer without a cast [enabled by default] >> drivers/firmware/efi/efi.c: In function ‘efi_config_init’: >> drivers/firmware/efi/efi.c:433:16: warning: assignment makes pointer >> from integer without a cast [enabled by default] >> > > This means efi.c should include but that does > not exist on ia64 either. > Perhaps add a #ifdef CONFIG_IA64? > #include I'll check if that works for all architectures. Guenter >>> --- >>> drivers/firmware/efi/efi.c | 2 -- >>> 1 file changed, 2 deletions(-) >>> >>> diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c >>> index cffa89b3317b..027ca212179f 100644 >>> --- a/drivers/firmware/efi/efi.c >>> +++ b/drivers/firmware/efi/efi.c >>> @@ -25,8 +25,6 @@ >>> #include >>> #include >>> >>> -#include >>> - >>> struct efi __read_mostly efi = { >>> .mps = EFI_INVALID_TABLE_ADDR, >>> .acpi = EFI_INVALID_TABLE_ADDR, >>> -- >>> 2.1.4 >>> >