|
@@ -562,10 +562,9 @@ early_ioremap(resource_size_t phys_addr, unsigned long size)
|
|
|
}
|
|
|
|
|
|
/* Remap memory */
|
|
|
-void __init __iomem *
|
|
|
-early_memremap(resource_size_t phys_addr, unsigned long size)
|
|
|
+void __init *early_memremap(resource_size_t phys_addr, unsigned long size)
|
|
|
{
|
|
|
- return __early_ioremap(phys_addr, size, PAGE_KERNEL);
|
|
|
+ return (__force void *)__early_ioremap(phys_addr, size, PAGE_KERNEL);
|
|
|
}
|
|
|
|
|
|
void __init early_iounmap(void __iomem *addr, unsigned long size)
|
|
@@ -620,3 +619,8 @@ void __init early_iounmap(void __iomem *addr, unsigned long size)
|
|
|
}
|
|
|
prev_map[slot] = NULL;
|
|
|
}
|
|
|
+
|
|
|
+void __init early_memunmap(void *addr, unsigned long size)
|
|
|
+{
|
|
|
+ early_iounmap((__force void __iomem *)addr, size);
|
|
|
+}
|