From 801cf2d5b798a39f8427801d33ab3694ed4eae20 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 4 Aug 2009 16:00:36 +0900
Subject: [PATCH] --- yaml --- r: 163353 b: refs/heads/master c:
 b5eb10ae901fa797c19accb684825f0e36ecbe0f h: refs/heads/master i:   163351:
 b87e29d00bae2caa9c664d1117a1b61887034780 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/sh/mm/pg-mmu.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9f329eeb3445..38e1c93969c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 222db3e5f21fca563f5f692e000afcc01cb4395c
+refs/heads/master: b5eb10ae901fa797c19accb684825f0e36ecbe0f
diff --git a/trunk/arch/sh/mm/pg-mmu.c b/trunk/arch/sh/mm/pg-mmu.c
index e5c5122f4d62..a9ede7bae520 100644
--- a/trunk/arch/sh/mm/pg-mmu.c
+++ b/trunk/arch/sh/mm/pg-mmu.c
@@ -56,7 +56,7 @@ static void *kmap_coherent(struct page *page, unsigned long addr)
 	return (void *)vaddr;
 }
 
-static inline void kunmap_coherent(struct page *page)
+static inline void kunmap_coherent(void)
 {
 	dec_preempt_count();
 	preempt_check_resched();
@@ -70,7 +70,7 @@ void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
 	    !test_bit(PG_dcache_dirty, &page->flags)) {
 		void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
 		memcpy(vto, src, len);
-		kunmap_coherent(vto);
+		kunmap_coherent();
 	} else {
 		memcpy(dst, src, len);
 		if (boot_cpu_data.dcache.n_aliases)
@@ -89,7 +89,7 @@ void copy_from_user_page(struct vm_area_struct *vma, struct page *page,
 	    !test_bit(PG_dcache_dirty, &page->flags)) {
 		void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
 		memcpy(dst, vfrom, len);
-		kunmap_coherent(vfrom);
+		kunmap_coherent();
 	} else {
 		memcpy(dst, src, len);
 		if (boot_cpu_data.dcache.n_aliases)
@@ -108,7 +108,7 @@ void copy_user_highpage(struct page *to, struct page *from,
 	    !test_bit(PG_dcache_dirty, &from->flags)) {
 		vfrom = kmap_coherent(from, vaddr);
 		copy_page(vto, vfrom);
-		kunmap_coherent(vfrom);
+		kunmap_coherent();
 	} else {
 		vfrom = kmap_atomic(from, KM_USER0);
 		copy_page(vto, vfrom);