evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86/efi: Simplify EFI_DEBUG

Browse source 
... and lose one #ifdef .. #endif sandwich.

Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
Borislav Petkov 2013-10-31 17:24:59 +01:00 • committed by Matt Fleming
parent 72548e836b
commit f4fccac05f
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/x86/platform/efi/efi.c
View file

@ -51,7 +51,7 @@
#include <asm/x86_init.h> #include <asm/x86_init.h>
#include <asm/rtc.h> #include <asm/rtc.h>
#define EFI_DEBUG 1 #define EFI_DEBUG
#define EFI_MIN_RESERVE 5120 #define EFI_MIN_RESERVE 5120
@ -398,9 +398,9 @@ int __init efi_memblock_x86_reserve_range(void)
return 0; return 0;
} }
#if EFI_DEBUG
static void __init print_efi_memmap(void) static void __init print_efi_memmap(void)
{ {
#ifdef EFI_DEBUG
efi_memory_desc_t *md; efi_memory_desc_t *md;
void *p; void *p;
int i; int i;
@ -415,8 +415,8 @@ static void __init print_efi_memmap(void)
md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT), md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
(md->num_pages >> (20 - EFI_PAGE_SHIFT))); (md->num_pages >> (20 - EFI_PAGE_SHIFT)));
} }
}
#endif /* EFI_DEBUG */ #endif /* EFI_DEBUG */
}
void __init efi_reserve_boot_services(void) void __init efi_reserve_boot_services(void)
{ {
@ -696,10 +696,7 @@ void __init efi_init(void)
x86_platform.set_wallclock = efi_set_rtc_mmss; x86_platform.set_wallclock = efi_set_rtc_mmss;
} }
#endif #endif
#if EFI_DEBUG
print_efi_memmap(); print_efi_memmap();
#endif
} }
void __init efi_late_init(void) void __init efi_late_init(void)