A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 18:51:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

x86/efi: Test for EFI_MEMMAP functionality when iterating EFI memmap

Browse source 
Both efi_find_mirror() and efi_fake_memmap() really want to know
whether the EFI memory map is available, not just whether the machine
was booted using EFI. efi_fake_memmap() even has a check for
EFI_MEMMAP at the start of the function.

Since we've already got other code that has this dependency, merge
everything under one if() conditional, and remove the now superfluous
check from efi_fake_memmap().

Tested-by: Dave Young <[email protected]> [kexec/kdump]
Tested-by: Ard Biesheuvel <[email protected]> [arm]
Acked-by: Ard Biesheuvel <[email protected]>
Cc: Taku Izumi <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Xishi Qiu <[email protected]>
Cc: Kamezawa Hiroyuki <[email protected]>
Signed-off-by: Matt Fleming <[email protected]>
This commit is contained in:
Matt Fleming 2016-06-21 23:11:38 +01:00
commit 4971531af3
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/firmware/efi/fake_mem.c
View file

@ -64,7 +64,7 @@ void __init efi_fake_memmap(void)
void *old, *new;
int i;
if (!nr_fake_mem || !efi_enabled(EFI_MEMMAP))
if (!nr_fake_mem)
return;
/* count up the number of EFI memory descriptor */