diff options
-rw-r--r-- | arch/mips/mm/cache.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/init.c | 8 | ||||
-rw-r--r-- | include/asm-mips/cacheflush.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 4e8f1b683376..abf99b1eba13 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c | |||
@@ -96,7 +96,7 @@ void __flush_anon_page(struct page *page, unsigned long vmaddr) | |||
96 | 96 | ||
97 | kaddr = kmap_coherent(page, vmaddr); | 97 | kaddr = kmap_coherent(page, vmaddr); |
98 | flush_data_cache_page((unsigned long)kaddr); | 98 | flush_data_cache_page((unsigned long)kaddr); |
99 | kunmap_coherent(kaddr); | 99 | kunmap_coherent(); |
100 | } | 100 | } |
101 | } | 101 | } |
102 | 102 | ||
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 8800c88cbbf6..2d1c2c024822 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
@@ -177,7 +177,7 @@ void *kmap_coherent(struct page *page, unsigned long addr) | |||
177 | 177 | ||
178 | #define UNIQUE_ENTRYHI(idx) (CKSEG0 + ((idx) << (PAGE_SHIFT + 1))) | 178 | #define UNIQUE_ENTRYHI(idx) (CKSEG0 + ((idx) << (PAGE_SHIFT + 1))) |
179 | 179 | ||
180 | void kunmap_coherent(struct page *page) | 180 | void kunmap_coherent(void) |
181 | { | 181 | { |
182 | #ifndef CONFIG_MIPS_MT_SMTC | 182 | #ifndef CONFIG_MIPS_MT_SMTC |
183 | unsigned int wired; | 183 | unsigned int wired; |
@@ -210,7 +210,7 @@ void copy_user_highpage(struct page *to, struct page *from, | |||
210 | if (cpu_has_dc_aliases) { | 210 | if (cpu_has_dc_aliases) { |
211 | vfrom = kmap_coherent(from, vaddr); | 211 | vfrom = kmap_coherent(from, vaddr); |
212 | copy_page(vto, vfrom); | 212 | copy_page(vto, vfrom); |
213 | kunmap_coherent(from); | 213 | kunmap_coherent(); |
214 | } else { | 214 | } else { |
215 | vfrom = kmap_atomic(from, KM_USER0); | 215 | vfrom = kmap_atomic(from, KM_USER0); |
216 | copy_page(vto, vfrom); | 216 | copy_page(vto, vfrom); |
@@ -233,7 +233,7 @@ void copy_to_user_page(struct vm_area_struct *vma, | |||
233 | if (cpu_has_dc_aliases) { | 233 | if (cpu_has_dc_aliases) { |
234 | void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); | 234 | void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); |
235 | memcpy(vto, src, len); | 235 | memcpy(vto, src, len); |
236 | kunmap_coherent(page); | 236 | kunmap_coherent(); |
237 | } else | 237 | } else |
238 | memcpy(dst, src, len); | 238 | memcpy(dst, src, len); |
239 | if ((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) | 239 | if ((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) |
@@ -250,7 +250,7 @@ void copy_from_user_page(struct vm_area_struct *vma, | |||
250 | void *vfrom = | 250 | void *vfrom = |
251 | kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); | 251 | kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); |
252 | memcpy(dst, vfrom, len); | 252 | memcpy(dst, vfrom, len); |
253 | kunmap_coherent(page); | 253 | kunmap_coherent(); |
254 | } else | 254 | } else |
255 | memcpy(dst, src, len); | 255 | memcpy(dst, src, len); |
256 | } | 256 | } |
diff --git a/include/asm-mips/cacheflush.h b/include/asm-mips/cacheflush.h index 28d907d4347a..4933b4947ed0 100644 --- a/include/asm-mips/cacheflush.h +++ b/include/asm-mips/cacheflush.h | |||
@@ -96,6 +96,6 @@ extern void (*flush_data_cache_page)(unsigned long addr); | |||
96 | unsigned long __init run_uncached(void *func); | 96 | unsigned long __init run_uncached(void *func); |
97 | 97 | ||
98 | extern void *kmap_coherent(struct page *page, unsigned long addr); | 98 | extern void *kmap_coherent(struct page *page, unsigned long addr); |
99 | extern void kunmap_coherent(struct page *page); | 99 | extern void kunmap_coherent(void); |
100 | 100 | ||
101 | #endif /* _ASM_CACHEFLUSH_H */ | 101 | #endif /* _ASM_CACHEFLUSH_H */ |