Commit-ID:  35575e0e8ba633fc8276509a21f89b599b4f9006
Gitweb:     http://git.kernel.org/tip/35575e0e8ba633fc8276509a21f89b599b4f9006
Author:     Robert Elliott <[email protected]>
AuthorDate: Mon, 1 Feb 2016 22:07:07 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 3 Feb 2016 11:41:20 +0100

efi: Add Persistent Memory type name

Add the "Persistent Memory" string for type 14 introduced in
UEFI 2.5.  This is used when printing the UEFI memory map.

old:
  efi: mem61: [type=14            |   |  |  |  |  |  | |WB|WT|WC|UC] 
range=[0x0000000880000000-0x0000000c7fffffff) (16384MB)

new:
  efi: mem61: [Persistent Memory  |   |  |  |  |  |  | |WB|WT|WC|UC] 
range=[0x0000000880000000-0x0000000c7fffffff) (16384MB)

Signed-off-by: Robert Elliott <[email protected]>
Signed-off-by: Matt Fleming <[email protected]>
Reviewed-by: Laszlo Ersek <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Ard Biesheuvel <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Ross Zwisler <[email protected]>
Cc: Taku Izumi <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: 
http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
 drivers/firmware/efi/efi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index f437048..3a69ed5 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -555,7 +555,8 @@ static __initdata char memory_type_name[][20] = {
        "ACPI Memory NVS",
        "Memory Mapped I/O",
        "MMIO Port Space",
-       "PAL Code"
+       "PAL Code",
+       "Persistent Memory",
 };
 
 char * __init efi_md_typeattr_format(char *buf, size_t size,

Reply via email to