aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sh/mm/pg-mmu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/mm/pg-mmu.c b/arch/sh/mm/pg-mmu.c
index e5c5122f4d62..a9ede7bae520 100644
--- a/arch/sh/mm/pg-mmu.c
+++ b/arch/sh/mm/pg-mmu.c
@@ -56,7 +56,7 @@ static void *kmap_coherent(struct page *page, unsigned long addr)
56 return (void *)vaddr; 56 return (void *)vaddr;
57} 57}
58 58
59static inline void kunmap_coherent(struct page *page) 59static inline void kunmap_coherent(void)
60{ 60{
61 dec_preempt_count(); 61 dec_preempt_count();
62 preempt_check_resched(); 62 preempt_check_resched();
@@ -70,7 +70,7 @@ void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
70 !test_bit(PG_dcache_dirty, &page->flags)) { 70 !test_bit(PG_dcache_dirty, &page->flags)) {
71 void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); 71 void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
72 memcpy(vto, src, len); 72 memcpy(vto, src, len);
73 kunmap_coherent(vto); 73 kunmap_coherent();
74 } else { 74 } else {
75 memcpy(dst, src, len); 75 memcpy(dst, src, len);
76 if (boot_cpu_data.dcache.n_aliases) 76 if (boot_cpu_data.dcache.n_aliases)
@@ -89,7 +89,7 @@ void copy_from_user_page(struct vm_area_struct *vma, struct page *page,
89 !test_bit(PG_dcache_dirty, &page->flags)) { 89 !test_bit(PG_dcache_dirty, &page->flags)) {
90 void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); 90 void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
91 memcpy(dst, vfrom, len); 91 memcpy(dst, vfrom, len);
92 kunmap_coherent(vfrom); 92 kunmap_coherent();
93 } else { 93 } else {
94 memcpy(dst, src, len); 94 memcpy(dst, src, len);
95 if (boot_cpu_data.dcache.n_aliases) 95 if (boot_cpu_data.dcache.n_aliases)
@@ -108,7 +108,7 @@ void copy_user_highpage(struct page *to, struct page *from,
108 !test_bit(PG_dcache_dirty, &from->flags)) { 108 !test_bit(PG_dcache_dirty, &from->flags)) {
109 vfrom = kmap_coherent(from, vaddr); 109 vfrom = kmap_coherent(from, vaddr);
110 copy_page(vto, vfrom); 110 copy_page(vto, vfrom);
111 kunmap_coherent(vfrom); 111 kunmap_coherent();
112 } else { 112 } else {
113 vfrom = kmap_atomic(from, KM_USER0); 113 vfrom = kmap_atomic(from, KM_USER0);
114 copy_page(vto, vfrom); 114 copy_page(vto, vfrom);