[Xen-changelog] [xen master] arm: remove unneeded ifdef CONFIG_ARM in efi-boot.h

[patchbot@xxxxxxx]

commit 617026feaea6f16fccad583afad0f70c1a83eb4e
Author:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
AuthorDate: Thu Mar 3 08:56:06 2016 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Mar 3 08:56:06 2016 +0100

    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@xxxxxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/arm/efi/efi-boot.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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;
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog