From 9718af706725317bc3f437b3192f06402908f19c Mon Sep 17 00:00:00 2001 From: Myron Stowe Date: Thu, 9 Feb 2012 09:36:41 -0700 Subject: [PATCH] --- yaml --- r: 298060 b: refs/heads/master c: 8cdde126aa60ced0d63ff137378e09dd01dfadda h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/osl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d0ce65f87cf..b3b2e96575c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37d2a3622d249d83413c92a1cd9e94b5237d0fcc +refs/heads/master: 8cdde126aa60ced0d63ff137378e09dd01dfadda 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);