vserver 2.0 rc7

[linux-2.6.git] / include / asm-sparc64 / cacheflush.h

diff --git a/include/asm-sparc64/cacheflush.h b/include/asm-sparc64/cacheflush.h
index f4b1df6..51b26e8 100644 (file)
--- a/include/asm-sparc64/cacheflush.h
+++ b/include/asm-sparc64/cacheflush.h
@@ -2,6 +2,17 @@
 #define _SPARC64_CACHEFLUSH_H
 
 #include <linux/config.h>
+#include <asm/page.h>
+
+/* Flushing for D-cache alias handling is only needed if
+ * the page size is smaller than 16K.
+ */
+#if PAGE_SHIFT < 14
+#define DCACHE_ALIASING_POSSIBLE
+#endif
+
+#ifndef __ASSEMBLY__
+
 #include <linux/mm.h>
 
 /* Cache flush operations. */
@@ -11,7 +22,7 @@
        do { if ((__mm) == current->mm) flushw_user(); } while(0)
 #define flush_cache_range(vma, start, end) \
        flush_cache_mm((vma)->vm_mm)
-#define flush_cache_page(vma, page) \
+#define flush_cache_page(vma, page, pfn) \
        flush_cache_mm((vma)->vm_mm)
 
 /* 
@@ -20,9 +31,9 @@
  * module load, so we need this.
  */
 extern void flush_icache_range(unsigned long start, unsigned long end);
+extern void __flush_icache_page(unsigned long);
 
 extern void __flush_dcache_page(void *addr, int flush_icache);
-extern void __flush_icache_page(unsigned long);
 extern void flush_dcache_page_impl(struct page *page);
 #ifdef CONFIG_SMP
 extern void smp_flush_dcache_page_impl(struct page *page, int cpu);
@@ -33,27 +44,35 @@ extern void flush_dcache_page_all(struct mm_struct *mm, struct page *page);
 #endif
 
 extern void __flush_dcache_range(unsigned long start, unsigned long end);
+extern void flush_dcache_page(struct page *page);
 
 #define flush_icache_page(vma, pg)     do { } while(0)
 #define flush_icache_user_range(vma,pg,adr,len)        do { } while (0)
 
-#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-       do {                                    \
-               flush_cache_page(vma, vaddr);   \
-               memcpy(dst, src, len);          \
+extern void flush_ptrace_access(struct vm_area_struct *, struct page *,
+                               unsigned long uaddr, void *kaddr,
+                               unsigned long len, int write);
+
+#define copy_to_user_page(vma, page, vaddr, dst, src, len)             \
+       do {                                                            \
+               flush_cache_page(vma, vaddr, page_to_pfn(page));        \
+               memcpy(dst, src, len);                                  \
+               flush_ptrace_access(vma, page, vaddr, src, len, 0);     \
        } while (0)
 
-#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-       do {                                    \
-               flush_cache_page(vma, vaddr);   \
-               memcpy(dst, src, len);          \
+#define copy_from_user_page(vma, page, vaddr, dst, src, len)           \
+       do {                                                            \
+               flush_cache_page(vma, vaddr, page_to_pfn(page));        \
+               memcpy(dst, src, len);                                  \
+               flush_ptrace_access(vma, page, vaddr, dst, len, 1);     \
        } while (0)
 
-extern void flush_dcache_page(struct page *page);
 #define flush_dcache_mmap_lock(mapping)                do { } while (0)
 #define flush_dcache_mmap_unlock(mapping)      do { } while (0)
 
 #define flush_cache_vmap(start, end)           do { } while (0)
 #define flush_cache_vunmap(start, end)         do { } while (0)
 
+#endif /* !__ASSEMBLY__ */
+
 #endif /* _SPARC64_CACHEFLUSH_H */