2 files changed, 5 insertions, 4 deletions

diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 0c9ea38d2caa..d7fff752e569 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -111,8 +111,9 @@ static int __sq_remap(struct sq_mapping *map, unsigned long flags)
 
         vma->phys_addr = map->addr;
 
-        if (remap_area_pages((unsigned long)vma->addr, vma->phys_addr,
-                             map->size, flags)) {
+        if (ioremap_page_range((unsigned long)vma->addr,
+                               (unsigned long)vma->addr + map->size,
+                               vma->phys_addr, __pgprot(flags))) {
                 vunmap(vma->addr);
                 return -EAGAIN;
         }
@@ -176,7 +177,7 @@ unsigned long sq_remap(unsigned long phys, unsigned int size,
 
         map->sq_addr = P4SEG_STORE_QUE + (page << PAGE_SHIFT);
 
-        ret = __sq_remap(map, flags);
+        ret = __sq_remap(map, pgprot_val(PAGE_KERNEL_NOCACHE) | flags);
         if (unlikely(ret != 0))
                 goto out;
 
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index ae531affccbd..c6955157c989 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -107,7 +107,7 @@ void __init p3_cache_init(void)
 
         emit_cache_params();
 
-        if (remap_area_pages(P3SEG, 0, PAGE_SIZE * 4, _PAGE_CACHABLE))
+        if (ioremap_page_range(P3SEG, P3SEG + (PAGE_SIZE * 4), 0, PAGE_KERNEL))
                 panic("%s failed.", __FUNCTION__);
 
         for (i = 0; i < cpu_data->dcache.n_aliases; i++)