arm: remove unneeded ifdef CONFIG_ARM in efi-boot.h

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 <stefano.stabellini@eu.citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h
index a6c3b69155b7b8629e4309f7f2ee1fb180452e0a..c58cacaee8be1994bead351980d98f3b47437b4e 100644 (file)
--- 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;