Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[powerpc.git] / arch / avr32 / mm / cache.c

diff --git a/arch/avr32/mm/cache.c b/arch/avr32/mm/cache.c
index 8f7b1c3..15a4e5e 100644 (file)
--- a/arch/avr32/mm/cache.c
+++ b/arch/avr32/mm/cache.c
@@ -23,7 +23,6 @@
 void invalidate_dcache_region(void *start, size_t size)
 {
        unsigned long v, begin, end, linesz, mask;
-       int flush = 0;
 
        linesz = boot_cpu_data.dcache.linesz;
        mask = linesz - 1;
@@ -32,24 +31,21 @@ void invalidate_dcache_region(void *start, size_t size)
         * instead of invalidating ... never discard valid data!
         */
        begin = (unsigned long)start;
-       end = begin + size - 1;
+       end = begin + size;
 
        if (begin & mask) {
                flush_dcache_line(start);
                begin += linesz;
-               flush = 1;
        }
-       if ((end & mask) != mask) {
+       if (end & mask) {
                flush_dcache_line((void *)end);
-               end -= linesz;
-               flush = 1;
+               end &= ~mask;
        }
 
        /* remaining cachelines only need invalidation */
-       for (v = begin; v <= end; v += linesz)
+       for (v = begin; v < end; v += linesz)
                invalidate_dcache_line((void *)v);
-       if (flush)
-               flush_write_buffer();
+       flush_write_buffer();
 }
 
 void clean_dcache_region(void *start, size_t size)
@@ -126,16 +122,6 @@ void flush_icache_page(struct vm_area_struct *vma, struct page *page)
        }
 }
 
-/*
- * This one is used by copy_to_user_page()
- */
-void flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
-                            unsigned long addr, int len)
-{
-       if (vma->vm_flags & VM_EXEC)
-               flush_icache_range(addr, addr + len);
-}
-
 asmlinkage int sys_cacheflush(int operation, void __user *addr, size_t len)
 {
        int ret;
@@ -163,3 +149,13 @@ asmlinkage int sys_cacheflush(int operation, void __user *addr, size_t len)
 out:
        return ret;
 }
+
+void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
+               unsigned long vaddr, void *dst, const void *src,
+               unsigned long len)
+{
+       memcpy(dst, src, len);
+       if (vma->vm_flags & VM_EXEC)
+               flush_icache_range((unsigned long)dst,
+                               (unsigned long)dst + len);
+}