From: Myron Stowe <mstowe@redhat.com>
Date: Thu, 9 Feb 2012 16:36:41 +0000 (-0700)
Subject: ACPI: Fix logic for removing mappings in 'acpi_unmap'
X-Git-Tag: firefly_0821_release~3680^2~2945^2~2^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8cdde126aa60ced0d63ff137378e09dd01dfadda;p=firefly-linux-kernel-4.4.55.git

ACPI: Fix logic for removing mappings in 'acpi_unmap'

Make sure the removal of mappings uses the same logic that put the
mappings in place.

Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 412a1e04a922..5aef087d42d0 100644
--- a/drivers/acpi/osl.c
+++ b/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);