aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/cpu/sh4/sq.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-12-09 09:16:12 +0900
committerPaul Mundt <lethal@linux-sh.org>2006-12-12 08:42:08 +0900
commit37bda1da4570c2e9c6dd34e77d2120218e384950 (patch)
treeaed9dbddd0e9ac13a1fc2d2ce3323fee9741b833 /arch/sh/kernel/cpu/sh4/sq.c
parentsh: Fixup kernel_execve() for syscall cleanups. (diff)
downloadlinux-dev-37bda1da4570c2e9c6dd34e77d2120218e384950.tar.xz
linux-dev-37bda1da4570c2e9c6dd34e77d2120218e384950.zip
sh: Convert remaining remap_area_pages() users to ioremap_page_range().
A couple of these were missed. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to '')
-rw-r--r--arch/sh/kernel/cpu/sh4/sq.c7
1 files changed, 4 insertions, 3 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;