From e83e2b7549ef347becb0f489623ad0220748a478 Mon Sep 17 00:00:00 2001
From: Jay Lan <jlan@sgi.com>
Date: Mon, 22 Sep 2008 14:21:19 -0700
Subject: [PATCH] --- yaml --- r: 109963 b: refs/heads/master c:
 d3758f87f39c5b072dde74c55bfb988262a3a45c h: refs/heads/master i:   109961:
 b1fcbffd03d56694ff05b6168dffd28462a9ae3a   109959:
 af6978d35f42dcb4042e6e40660b1acec99b54b8 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/ia64/kernel/efi.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d8fd1913e3d0..a9059e0b8f14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06f95ea8988513b172080c419e4be8826c55a318
+refs/heads/master: d3758f87f39c5b072dde74c55bfb988262a3a45c
diff --git a/trunk/arch/ia64/kernel/efi.c b/trunk/arch/ia64/kernel/efi.c
index d45f215bc8fc..51b75cea7018 100644
--- a/trunk/arch/ia64/kernel/efi.c
+++ b/trunk/arch/ia64/kernel/efi.c
@@ -1232,9 +1232,10 @@ efi_initialize_iomem_resources(struct resource *code_resource,
 				if (md->attribute & EFI_MEMORY_WP) {
 					name = "System ROM";
 					flags |= IORESOURCE_READONLY;
-				} else {
+				} else if (md->attribute == EFI_MEMORY_UC)
+					name = "Uncached RAM";
+				else
 					name = "System RAM";
-				}
 				break;
 
 			case EFI_ACPI_MEMORY_NVS: