ARM: 6164/1: Add kto and kfrom to input operands list.

[safe/jmp/linux-2.6] / arch / arm / mm / copypage-xsc3.c

diff --git a/arch/arm/mm/copypage-xsc3.c b/arch/arm/mm/copypage-xsc3.c
index 0e7cb32..f9cde07 100644 (file)
--- a/arch/arm/mm/copypage-xsc3.c
+++ b/arch/arm/mm/copypage-xsc3.c
@@ -29,12 +29,12 @@
  * if we eventually end up using our copied page.
  *
  */
-static void __attribute__((naked))
+static void __naked
 xsc3_mc_copy_user_page(void *kto, const void *kfrom)
 {
        asm("\
        stmfd   sp!, {r4, r5, lr}               \n\
-       mov     lr, %0                          \n\
+       mov     lr, %2                          \n\
                                                \n\
        pld     [r1, #0]                        \n\
        pld     [r1, #32]                       \n\
@@ -67,16 +67,17 @@ xsc3_mc_copy_user_page(void *kto, const void *kfrom)
                                                \n\
        ldmfd   sp!, {r4, r5, pc}"
        :
-       : "I" (PAGE_SIZE / 64 - 1));
+       : "r" (kto), "r" (kfrom), "I" (PAGE_SIZE / 64 - 1));
 }
 
 void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
-       unsigned long vaddr)
+       unsigned long vaddr, struct vm_area_struct *vma)
 {
        void *kto, *kfrom;
 
        kto = kmap_atomic(to, KM_USER0);
        kfrom = kmap_atomic(from, KM_USER1);
+       flush_cache_page(vma, vaddr, page_to_pfn(from));
        xsc3_mc_copy_user_page(kto, kfrom);
        kunmap_atomic(kfrom, KM_USER1);
        kunmap_atomic(kto, KM_USER0);
@@ -89,9 +90,9 @@ void xsc3_mc_copy_user_highpage(struct page *to, struct page *from,
  */
 void xsc3_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-       void *kaddr = kmap_atomic(page, KM_USER0);
-       asm("\
-       mov     r1, %1                          \n\
+       void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+       asm volatile ("\
+       mov     r1, %2                          \n\
        mov     r2, #0                          \n\
        mov     r3, #0                          \n\
 1:     mcr     p15, 0, %0, c7, c6, 1           @ invalidate line\n\
@@ -101,8 +102,8 @@ void xsc3_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
        strd    r2, [%0], #8                    \n\
        subs    r1, r1, #1                      \n\
        bne     1b"
-       :
-       : "r" (kaddr), "I" (PAGE_SIZE / 32)
+       : "=r" (ptr)
+       : "0" (kaddr), "I" (PAGE_SIZE / 32)
        : "r1", "r2", "r3");
        kunmap_atomic(kaddr, KM_USER0);
 }