OSDN Git Service
(root)
/
uclinux-h8
/
linux.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...
[uclinux-h8/linux.git]
/
arch
/
x86
/
platform
/
efi
/
efi.c
diff --git
a/arch/x86/platform/efi/efi.c
b/arch/x86/platform/efi/efi.c
index
c1c382c
..
cfba30f
100644
(file)
--- a/
arch/x86/platform/efi/efi.c
+++ b/
arch/x86/platform/efi/efi.c
@@
-174,6
+174,9
@@
static void __init do_add_efi_memmap(void)
case EFI_UNUSABLE_MEMORY:
e820_type = E820_UNUSABLE;
break;
case EFI_UNUSABLE_MEMORY:
e820_type = E820_UNUSABLE;
break;
+ case EFI_PERSISTENT_MEMORY:
+ e820_type = E820_PMEM;
+ break;
default:
/*
* EFI_RESERVED_TYPE EFI_RUNTIME_SERVICES_CODE
default:
/*
* EFI_RESERVED_TYPE EFI_RUNTIME_SERVICES_CODE