---

yaml --- r: 44553 b: refs/heads/master c: 77fff4a h: refs/heads/master i: 44551: f65230b v: v3
git-mirror · Dec 13, 2006 · 43a2d97 · 43a2d97
1 parent 786a5a8
commit 43a2d97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;