From: Aleksey Makarov <aleksey.makarov@linaro.org>
Date: Mon, 20 Jun 2016 10:56:09 +0000 (+0300)
Subject: ACPI / tables: table upgrade: use cacheable map for tables
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ce0c1fcc7357ef0ec93c5a1cd1a759729d27599a;p=deliverable%2Flinux.git

ACPI / tables: table upgrade: use cacheable map for tables

The new memory allocated in acpi_table_initrd_init() is used to
copy the upgraded tables to it.  So it should be mapped with
early_memunmap() instead of early_ioremap().

This is critical for ARM.

Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
Acked-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index a372f9eaa15d..f829e6a2e663 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -578,10 +578,10 @@ static void __init acpi_table_initrd_init(void *data, size_t size)
 			clen = size;
 			if (clen > MAP_CHUNK_SIZE - slop)
 				clen = MAP_CHUNK_SIZE - slop;
-			dest_p = early_ioremap(dest_addr & PAGE_MASK,
-						 clen + slop);
+			dest_p = early_memremap(dest_addr & PAGE_MASK,
+						clen + slop);
 			memcpy(dest_p + slop, src_p, clen);
-			early_iounmap(dest_p, clen + slop);
+			early_memunmap(dest_p, clen + slop);
 			src_p += clen;
 			dest_addr += clen;
 			size -= clen;