From patchwork Tue Mar 1 15:35:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 8466231 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9AA9AC0553 for ; Tue, 1 Mar 2016 15:39:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CB88F202FF for ; Tue, 1 Mar 2016 15:39:23 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 076C6202E5 for ; Tue, 1 Mar 2016 15:39:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aamLd-0007qK-2S; Tue, 01 Mar 2016 15:36:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aamLc-0007qE-0i for xen-devel@lists.xensource.com; Tue, 01 Mar 2016 15:36:28 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 83/D0-02874-BF6B5D65; Tue, 01 Mar 2016 15:36:27 +0000 X-Env-Sender: prvs=86193f78b=Stefano.Stabellini@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1456846585!27916675!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 65250 invoked from network); 1 Mar 2016 15:36:26 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 1 Mar 2016 15:36:26 -0000 X-IronPort-AV: E=Sophos;i="5.22,523,1449532800"; d="scan'208";a="342228058" Date: Tue, 1 Mar 2016 15:35:16 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-DLP: MIA2 Cc: Stefano Stabellini Subject: [Xen-devel] [PATCH] arm: remove unneeded ifdef CONFIG_ARM in efi-boot.h X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Ifdef'ing CONFIG_ARM in xen/arch/arm/efi/efi-boot.h is redundant, remove the condition and simplify the ifdef's. Signed-off-by: Stefano Stabellini Reviewed-by: Jan Beulich diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index a6c3b69..c58caca 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -17,7 +17,7 @@ void __flush_dcache_area(const void *vaddr, unsigned long size); static struct file __initdata dtbfile; static void __initdata *fdt; static void __initdata *memmap; -#if defined (CONFIG_ACPI) && defined (CONFIG_ARM) +#ifdef CONFIG_ACPI static struct meminfo __initdata acpi_mem; #endif @@ -154,7 +154,7 @@ static EFI_STATUS __init efi_process_memory_map_bootinfo(EFI_MEMORY_DESCRIPTOR * bootinfo.mem.bank[i].size = desc_ptr->NumberOfPages * EFI_PAGE_SIZE; ++i; } -#if defined (CONFIG_ACPI) && defined (CONFIG_ARM) +#ifdef CONFIG_ACPI else if ( desc_ptr->Type == EfiACPIReclaimMemory ) { if ( j >= NR_MEM_BANKS ) @@ -172,7 +172,7 @@ static EFI_STATUS __init efi_process_memory_map_bootinfo(EFI_MEMORY_DESCRIPTOR * } bootinfo.mem.nr_banks = i; -#if defined (CONFIG_ACPI) && defined (CONFIG_ARM) +#ifdef CONFIG_ACPI acpi_mem.nr_banks = j; #endif return EFI_SUCCESS;