From 8840ec8a355f90fb79fcc7a5edd871eabf365bd8 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 9 Feb 2005 12:59:39 +0000
Subject: [PATCH] --- yaml --- r: 10988 b: refs/heads/master c:
 26852d5cdb2bac01f2a48b815194a045e8a8e300 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-mips/cacheflush.h | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 82ec9493461b..4cba7ae1dccf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 505403b6a02aefc47c038acf56b719497b720012
+refs/heads/master: 26852d5cdb2bac01f2a48b815194a045e8a8e300
diff --git a/trunk/include/asm-mips/cacheflush.h b/trunk/include/asm-mips/cacheflush.h
index 635f1bfb403e..3780c9f9354a 100644
--- a/trunk/include/asm-mips/cacheflush.h
+++ b/trunk/include/asm-mips/cacheflush.h
@@ -55,11 +55,17 @@ extern void (*flush_icache_range)(unsigned long start, unsigned long end);
 
 #define copy_to_user_page(vma, page, vaddr, dst, src, len)		\
 do {									\
+	if (cpu_has_dc_aliases)						\
+		flush_cache_page(vma, vaddr);				\
 	memcpy(dst, (void *) src, len);					\
 	flush_icache_page(vma, page);					\
 } while (0)
 #define copy_from_user_page(vma, page, vaddr, dst, src, len)		\
-	memcpy(dst, src, len)
+do {									\
+	if (cpu_has_dc_aliases)						\
+		flush_cache_page(vma, vaddr);				\
+	memcpy(dst, src, len);						\
+} while (0)
 
 extern void (*flush_cache_sigtramp)(unsigned long addr);
 extern void (*flush_icache_all)(void);