projects
/
platform
/
kernel
/
linux-exynos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'libnvdimm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw...
[platform/kernel/linux-exynos.git]
/
arch
/
ia64
/
kernel
/
efi.c
diff --git
a/arch/ia64/kernel/efi.c
b/arch/ia64/kernel/efi.c
index
47e962f
..
caae3f4
100644
(file)
--- a/
arch/ia64/kernel/efi.c
+++ b/
arch/ia64/kernel/efi.c
@@
-1222,6
+1222,10
@@
efi_initialize_iomem_resources(struct resource *code_resource,
flags |= IORESOURCE_DISABLED;
break;
+ case EFI_PERSISTENT_MEMORY:
+ name = "Persistent Memory";
+ break;
+
case EFI_RESERVED_TYPE:
case EFI_RUNTIME_SERVICES_CODE:
case EFI_RUNTIME_SERVICES_DATA: