[PATCH] Fix COW D-cache aliasing on fork

[safe/jmp/linux-2.6] / include / linux / highmem.h

diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index 3d8768b..ea5780b 100644 (file)
--- a/include/linux/highmem.h
+++ b/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;