Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

[linux-2.6-omap-h63xx.git] / arch / arm / mm / copypage-v4wt.c

diff --git a/arch/arm/mm/copypage-v4wt.c b/arch/arm/mm/copypage-v4wt.c
index b8a345d6e77e01f0733be16a3f4d5291a2331e95..0f1188efae455e22b3f95af3e760399171a8f3e6 100644 (file)
--- a/arch/arm/mm/copypage-v4wt.c
+++ b/arch/arm/mm/copypage-v4wt.c
@@ -62,9 +62,9 @@ void v4wt_copy_user_highpage(struct page *to, struct page *from,
  */
 void v4wt_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-       void *kaddr = kmap_atomic(page, KM_USER0);
-       asm("\
-       mov     r1, %1                          @ 1\n\
+       void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+       asm volatile("\
+       mov     r1, %2                          @ 1\n\
        mov     r2, #0                          @ 1\n\
        mov     r3, #0                          @ 1\n\
        mov     ip, #0                          @ 1\n\
@@ -76,8 +76,8 @@ void v4wt_clear_user_highpage(struct page *page, unsigned long vaddr)
        subs    r1, r1, #1                      @ 1\n\
        bne     1b                              @ 1\n\
        mcr     p15, 0, r2, c7, c7, 0           @ flush ID cache"
-       :
-       : "r" (kaddr), "I" (PAGE_SIZE / 64)
+       : "=r" (ptr)
+       : "0" (kaddr), "I" (PAGE_SIZE / 64)
        : "r1", "r2", "r3", "ip", "lr");
        kunmap_atomic(kaddr, KM_USER0);
 }