From 597859e8b208ce24f8948b06c101c0c70c97664d Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@suse.com>
Date: Fri, 24 Feb 2012 11:41:53 +0000
Subject: [PATCH] --- yaml --- r: 298031 b: refs/heads/master c:
 e252675fb722d4a307cc380a06a905f03cf9951c h: refs/heads/master i:   298029:
 c0f5e1cc90e0f1c82e938b003256c4eee2a54013   298027:
 964656d379c288cb398c1beedd1acedd84545499   298023:
 35d0993843079374f239fc2780e5936a79f9215f   298015:
 97bf5f8aee8e732fc169bbe6a5d583b6b827a526 v: v3

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

diff --git a/[refs] b/[refs]
index 1ad70b1e33e5..6a30f1dc58d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89e96ada572fb216e582dbe3f64e1a6939a37f74
+refs/heads/master: e252675fb722d4a307cc380a06a905f03cf9951c
diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c
index 412a1e04a922..5aef087d42d0 100644
--- a/trunk/drivers/acpi/osl.c
+++ b/trunk/drivers/acpi/osl.c
@@ -347,7 +347,7 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr)
 	unsigned long pfn;
 
 	pfn = pg_off >> PAGE_SHIFT;
-	if (page_is_ram(pfn))
+	if (should_use_kmap(pfn))
 		kunmap(pfn_to_page(pfn));
 	else
 		iounmap(vaddr);