diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-12-08 19:16:12 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-12-11 18:42:08 -0500 |
commit | 37bda1da4570c2e9c6dd34e77d2120218e384950 (patch) | |
tree | aed9dbddd0e9ac13a1fc2d2ce3323fee9741b833 /arch/sh/kernel | |
parent | 79890c512444aa55a7a42ac5e7d29d7a4edba11b (diff) |
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 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/cpu/sh4/sq.c | 7 |
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) | |||
111 | 111 | ||
112 | vma->phys_addr = map->addr; | 112 | vma->phys_addr = map->addr; |
113 | 113 | ||
114 | if (remap_area_pages((unsigned long)vma->addr, vma->phys_addr, | 114 | if (ioremap_page_range((unsigned long)vma->addr, |
115 | map->size, flags)) { | 115 | (unsigned long)vma->addr + map->size, |
116 | vma->phys_addr, __pgprot(flags))) { | ||
116 | vunmap(vma->addr); | 117 | vunmap(vma->addr); |
117 | return -EAGAIN; | 118 | return -EAGAIN; |
118 | } | 119 | } |
@@ -176,7 +177,7 @@ unsigned long sq_remap(unsigned long phys, unsigned int size, | |||
176 | 177 | ||
177 | map->sq_addr = P4SEG_STORE_QUE + (page << PAGE_SHIFT); | 178 | map->sq_addr = P4SEG_STORE_QUE + (page << PAGE_SHIFT); |
178 | 179 | ||
179 | ret = __sq_remap(map, flags); | 180 | ret = __sq_remap(map, pgprot_val(PAGE_KERNEL_NOCACHE) | flags); |
180 | if (unlikely(ret != 0)) | 181 | if (unlikely(ret != 0)) |
181 | goto out; | 182 | goto out; |
182 | 183 | ||