From 2fd938fc929357240209ab3c9fcef90f2b1856de Mon Sep 17 00:00:00 2001
From: Davidlohr Bueso <davidlohr.bueso@hp.com>
Date: Wed, 9 Jan 2013 22:06:08 +0000
Subject: [PATCH] --- yaml --- r: 350986 b: refs/heads/master c:
 208f6cc9e5f83c9e2fb3a997dde3d4f6f5971384 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/acpi/numa.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dee148de91a6..97b33568aed2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33f767d767e9a684e9cd60704d4c049a2014c8d5
+refs/heads/master: 208f6cc9e5f83c9e2fb3a997dde3d4f6f5971384
diff --git a/trunk/drivers/acpi/numa.c b/trunk/drivers/acpi/numa.c
index cb31298ca684..2935d3a2bd7a 100644
--- a/trunk/drivers/acpi/numa.c
+++ b/trunk/drivers/acpi/numa.c
@@ -116,14 +116,16 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
 			struct acpi_srat_mem_affinity *p =
 			    (struct acpi_srat_mem_affinity *)header;
 			ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-					  "SRAT Memory (0x%lx length 0x%lx) in proximity domain %d %s%s\n",
+					  "SRAT Memory (0x%lx length 0x%lx) in proximity domain %d %s%s%s\n",
 					  (unsigned long)p->base_address,
 					  (unsigned long)p->length,
 					  p->proximity_domain,
 					  (p->flags & ACPI_SRAT_MEM_ENABLED)?
 					  "enabled" : "disabled",
 					  (p->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)?
-					  " hot-pluggable" : ""));
+					  " hot-pluggable" : "",
+					  (p->flags & ACPI_SRAT_MEM_NON_VOLATILE)?
+					  " non-volatile" : ""));
 		}
 #endif				/* ACPI_DEBUG_OUTPUT */
 		break;