From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932904AbcBCLgA (ORCPT ); Wed, 3 Feb 2016 06:36:00 -0500 Received: from terminus.zytor.com ([198.137.202.10]:55749 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755047AbcBCLf5 (ORCPT ); Wed, 3 Feb 2016 06:35:57 -0500 Date: Wed, 3 Feb 2016 03:34:38 -0800 From: tip-bot for Robert Elliott Message-ID: Cc: brgerst@gmail.com, tglx@linutronix.de, mingo@kernel.org, lersek@redhat.com, dvlasenk@redhat.com, torvalds@linux-foundation.org, izumi.taku@jp.fujitsu.com, luto@amacapital.net, peterz@infradead.org, dan.j.williams@intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, elliott@hpe.com, ard.biesheuvel@linaro.org, ross.zwisler@linux.intel.com, matt@codeblueprint.co.uk, bp@alien8.de Reply-To: luto@amacapital.net, peterz@infradead.org, torvalds@linux-foundation.org, izumi.taku@jp.fujitsu.com, lersek@redhat.com, dvlasenk@redhat.com, brgerst@gmail.com, mingo@kernel.org, tglx@linutronix.de, bp@alien8.de, ard.biesheuvel@linaro.org, ross.zwisler@linux.intel.com, matt@codeblueprint.co.uk, dan.j.williams@intel.com, linux-kernel@vger.kernel.org, elliott@hpe.com, hpa@zytor.com In-Reply-To: <1454364428-494-14-git-send-email-matt@codeblueprint.co.uk> References: <1454364428-494-14-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi: Add Persistent Memory type name Git-Commit-ID: 35575e0e8ba633fc8276509a21f89b599b4f9006 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 35575e0e8ba633fc8276509a21f89b599b4f9006 Gitweb: http://git.kernel.org/tip/35575e0e8ba633fc8276509a21f89b599b4f9006 Author: Robert Elliott AuthorDate: Mon, 1 Feb 2016 22:07:07 +0000 Committer: Ingo Molnar 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 Signed-off-by: Matt Fleming Reviewed-by: Laszlo Ersek Cc: Andy Lutomirski Cc: Ard Biesheuvel Cc: Borislav Petkov Cc: Brian Gerst Cc: Dan Williams Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Ross Zwisler Cc: Taku Izumi Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1454364428-494-14-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- 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,