projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-for-kalle-2015-07-30' of https://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
kernel
/
efi.c
diff --git
a/arch/arm64/kernel/efi.c
b/arch/arm64/kernel/efi.c
index ab21e0d58278825e5dfc0199cd18b853f07232c1..9d4aa18f2a825256537a7d7e33c606d89d003ee7 100644
(file)
--- a/
arch/arm64/kernel/efi.c
+++ b/
arch/arm64/kernel/efi.c
@@
-158,6
+158,7
@@
static __init int is_reserve_region(efi_memory_desc_t *md)
case EFI_BOOT_SERVICES_CODE:
case EFI_BOOT_SERVICES_DATA:
case EFI_CONVENTIONAL_MEMORY:
+ case EFI_PERSISTENT_MEMORY:
return 0;
default:
break;