vserver 1.9.5.x5

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

diff --git a/include/asm-parisc/cacheflush.h b/include/asm-parisc/cacheflush.h
index a5700c2..a3132a2 100644 (file)
--- a/include/asm-parisc/cacheflush.h
+++ b/include/asm-parisc/cacheflush.h
@@ -33,50 +33,28 @@ static inline void flush_cache_all(void)
 #define flush_cache_vmap(start, end)           flush_cache_all()
 #define flush_cache_vunmap(start, end)         flush_cache_all()
 
-/* The following value needs to be tuned and probably scaled with the
- * cache size.
- */
-
-#define FLUSH_THRESHOLD 0x80000
+extern int parisc_cache_flush_threshold;
+void parisc_setup_cache_timing(void);
 
 static inline void
 flush_user_dcache_range(unsigned long start, unsigned long end)
 {
-#ifdef CONFIG_SMP
-       flush_user_dcache_range_asm(start,end);
-#else
-       if ((end - start) < FLUSH_THRESHOLD)
+       if ((end - start) < parisc_cache_flush_threshold)
                flush_user_dcache_range_asm(start,end);
        else
                flush_data_cache();
-#endif
 }
 
 static inline void
 flush_user_icache_range(unsigned long start, unsigned long end)
 {
-#ifdef CONFIG_SMP
-       flush_user_icache_range_asm(start,end);
-#else
-       if ((end - start) < FLUSH_THRESHOLD)
+       if ((end - start) < parisc_cache_flush_threshold)
                flush_user_icache_range_asm(start,end);
        else
                flush_instruction_cache();
-#endif
 }
 
-extern void __flush_dcache_page(struct page *page);
-
-static inline void flush_dcache_page(struct page *page)
-{
-       struct address_space *mapping = page_mapping(page);
-
-       if (mapping && !mapping_mapped(mapping)) {
-               set_bit(PG_dcache_dirty, &page->flags);
-       } else {
-               __flush_dcache_page(page);
-       }
-}
+extern void flush_dcache_page(struct page *page);
 
 #define flush_dcache_mmap_lock(mapping) \
        spin_lock_irq(&(mapping)->tree_lock)
@@ -88,11 +66,17 @@ static inline void flush_dcache_page(struct page *page)
 #define flush_icache_range(s,e)                do { flush_kernel_dcache_range_asm(s,e); flush_kernel_icache_range_asm(s,e); } while (0)
 
 #define copy_to_user_page(vma, page, vaddr, dst, src, len) \
-do { memcpy(dst, src, len); \
-     flush_kernel_dcache_range_asm((unsigned long)dst, (unsigned long)dst + len); \
+do { \
+       flush_cache_page(vma, vaddr); \
+       memcpy(dst, src, len); \
+       flush_kernel_dcache_range_asm((unsigned long)dst, (unsigned long)dst + len); \
 } while (0)
+
 #define copy_from_user_page(vma, page, vaddr, dst, src, len) \
-       memcpy(dst, src, len)
+do { \
+       flush_cache_page(vma, vaddr); \
+       memcpy(dst, src, len); \
+} while (0)
 
 static inline void flush_cache_range(struct vm_area_struct *vma,
                unsigned long start, unsigned long end)
@@ -115,28 +99,29 @@ static inline void flush_cache_range(struct vm_area_struct *vma,
 
 /* Simple function to work out if we have an existing address translation
  * for a user space vma. */
-static inline int translation_exists(struct vm_area_struct *vma,
-                                    unsigned long addr)
+static inline pte_t *__translation_exists(struct mm_struct *mm,
+                                         unsigned long addr)
 {
-       pgd_t *pgd = pgd_offset(vma->vm_mm, addr);
+       pgd_t *pgd = pgd_offset(mm, addr);
        pmd_t *pmd;
        pte_t *pte;
 
        if(pgd_none(*pgd))
-               return 0;
+               return NULL;
 
        pmd = pmd_offset(pgd, addr);
        if(pmd_none(*pmd) || pmd_bad(*pmd))
-               return 0;
+               return NULL;
 
        pte = pte_offset_map(pmd, addr);
 
        /* The PA flush mappings show up as pte_none, but they're
         * valid none the less */
        if(pte_none(*pte) && ((pte_val(*pte) & _PAGE_FLUSH) == 0))
-               return 0;
-       return 1;
+               return NULL;
+       return pte;
 }
+#define        translation_exists(vma, addr)   __translation_exists((vma)->vm_mm, addr)
 
 
 /* Private function to flush a page from the cache of a non-current