Commit-ID: 35575e0e8ba633fc8276509a21f89b599b4f9006 Gitweb: http://git.kernel.org/tip/35575e0e8ba633fc8276509a21f89b599b4f9006 Author: Robert Elliott <elli...@hpe.com> AuthorDate: Mon, 1 Feb 2016 22:07:07 +0000 Committer: Ingo Molnar <mi...@kernel.org> 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 <elli...@hpe.com> Signed-off-by: Matt Fleming <m...@codeblueprint.co.uk> Reviewed-by: Laszlo Ersek <ler...@redhat.com> Cc: Andy Lutomirski <l...@amacapital.net> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> Cc: Borislav Petkov <b...@alien8.de> Cc: Brian Gerst <brge...@gmail.com> Cc: Dan Williams <dan.j.willi...@intel.com> Cc: Denys Vlasenko <dvlas...@redhat.com> Cc: H. Peter Anvin <h...@zytor.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Ross Zwisler <ross.zwis...@linux.intel.com> Cc: Taku Izumi <izumi.t...@jp.fujitsu.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: linux-...@vger.kernel.org Link: http://lkml.kernel.org/r/1454364428-494-14-git-send-email-m...@codeblueprint.co.uk Signed-off-by: Ingo Molnar <mi...@kernel.org> --- 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,