[ARM] fix a couple clear_user_highpage assembly constraints

In all cases the kaddr is assigned an input register even though it is
modified in the assembly code.  Let's assign a new variable to the
modified value and mark those inline asm with volatile otherwise they
get optimized away because the output variable is otherwise not used.

Also fix a few conversion errors in copypage-feroceon.c and
copypage-v4mc.c.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mm/copypage-xscale.c b/arch/arm/mm/copypage-xscale.c
index aa9f2ff9dce0..d18f2397ee2d 100644
--- a/arch/arm/mm/copypage-xscale.c
+++ b/arch/arm/mm/copypage-xscale.c
@@ -116,9 +116,9 @@ void xscale_mc_copy_user_highpage(struct page *to, struct page *from,
 void
 xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *kaddr = kmap_atomic(page, KM_USER0);
+        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
         asm volatile(
-        "mov    r1, %1                          \n\
+        "mov    r1, %2                          \n\
         mov     r2, #0                          \n\
         mov     r3, #0                          \n\
 1:      mov     ip, %0                          \n\
@@ -130,8 +130,8 @@ xscale_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
         subs    r1, r1, #1                      \n\
         mcr     p15, 0, ip, c7, c6, 1           @ invalidate D line\n\
         bne     1b"
-        :
-        : "r" (kaddr), "I" (PAGE_SIZE / 32)
+        : "=r" (ptr)
+        : "0" (kaddr), "I" (PAGE_SIZE / 32)
         : "r1", "r2", "r3", "ip");
         kunmap_atomic(kaddr, KM_USER0);
 }