aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/tables.c
diff options
context:
space:
mode:
authorAleksey Makarov <aleksey.makarov@linaro.org>2016-06-20 06:56:09 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-06-21 19:16:14 -0400
commitce0c1fcc7357ef0ec93c5a1cd1a759729d27599a (patch)
tree3fa7dc9dfd89038389e8c6e8e5123525e76c553a /drivers/acpi/tables.c
parent33688abb2802ff3a230bd2441f765477b94cc89e (diff)
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>
Diffstat (limited to 'drivers/acpi/tables.c')
-rw-r--r--drivers/acpi/tables.c6
1 files changed, 3 insertions, 3 deletions
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)
578 clen = size; 578 clen = size;
579 if (clen > MAP_CHUNK_SIZE - slop) 579 if (clen > MAP_CHUNK_SIZE - slop)
580 clen = MAP_CHUNK_SIZE - slop; 580 clen = MAP_CHUNK_SIZE - slop;
581 dest_p = early_ioremap(dest_addr & PAGE_MASK, 581 dest_p = early_memremap(dest_addr & PAGE_MASK,
582 clen + slop); 582 clen + slop);
583 memcpy(dest_p + slop, src_p, clen); 583 memcpy(dest_p + slop, src_p, clen);
584 early_iounmap(dest_p, clen + slop); 584 early_memunmap(dest_p, clen + slop);
585 src_p += clen; 585 src_p += clen;
586 dest_addr += clen; 586 dest_addr += clen;
587 size -= clen; 587 size -= clen;