From 43a2d978294c62b9828694b8384b1f90e8f9602f Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Tue, 12 Dec 2006 17:14:54 +0000
Subject: [PATCH] --- yaml --- r: 44553 b: refs/heads/master c:
 77fff4ae2b7bba6d66a8287d9ab948e2b6c16145 h: refs/heads/master i:   44551:
 f65230b33d52dcf98b8704447f706915cbf3b96d v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/highmem.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aab5cde97796..0dc670f651a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fb8cacc19dfe408a5dd758235561c58cadea174
+refs/heads/master: 77fff4ae2b7bba6d66a8287d9ab948e2b6c16145
diff --git a/trunk/include/linux/highmem.h b/trunk/include/linux/highmem.h
index 3d8768b619e9..ea5780b518ef 100644
--- a/trunk/include/linux/highmem.h
+++ b/trunk/include/linux/highmem.h
@@ -96,6 +96,8 @@ static inline void memclear_highpage_flush(struct page *page, unsigned int offse
 	kunmap_atomic(kaddr, KM_USER0);
 }
 
+#ifndef __HAVE_ARCH_COPY_USER_HIGHPAGE
+
 static inline void copy_user_highpage(struct page *to, struct page *from, unsigned long vaddr)
 {
 	char *vfrom, *vto;
@@ -109,6 +111,8 @@ static inline void copy_user_highpage(struct page *to, struct page *from, unsign
 	smp_wmb();
 }
 
+#endif
+
 static inline void copy_highpage(struct page *to, struct page *from)
 {
 	char *vfrom, *vto;