diff mbox

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

Message ID alpine.DEB.2.02.1603011531010.17938@kaball.uk.xensource.com (mailing list archive)
State New, archived
Headers show

Commit Message

Stefano Stabellini March 1, 2016, 3:35 p.m. UTC 
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>

Comments

Jan Beulich March 1, 2016, 3:47 p.m. UTC | #1 
>>> On 01.03.16 at 16:35, <stefano.stabellini@eu.citrix.com> wrote:
> 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>

Since you have no co-maintainer right now, and since the change
is pretty obviously correct, I guess we don't need to wait for
someone else's feedback before this could go in.

Jan
Stefano Stabellini March 1, 2016, 4:03 p.m. UTC | #2 
On Tue, 1 Mar 2016, Jan Beulich wrote:
> >>> On 01.03.16 at 16:35, <stefano.stabellini@eu.citrix.com> wrote:
> > 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>
> 
> Since you have no co-maintainer right now, and since the change
> is pretty obviously correct, I guess we don't need to wait for
> someone else's feedback before this could go in.
 
Yes, I was thinking the same thing
diff mbox

Patch

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;