[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>

7 files changed, 34 insertions, 34 deletions

diff --git a/arch/arm/mm/copypage-feroceon.c b/arch/arm/mm/copypage-feroceon.c
index c3651b2939c7..c3ba6a94da0c 100644
--- a/arch/arm/mm/copypage-feroceon.c
+++ b/arch/arm/mm/copypage-feroceon.c
@@ -81,9 +81,9 @@ void feroceon_copy_user_highpage(struct page *to, struct page *from,
 
 void feroceon_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\
         mov     r4, #0                          \n\
@@ -95,11 +95,11 @@ void feroceon_clear_user_highpage(struct page *page, unsigned long vaddr)
 1:      stmia   %0, {r2-r7, ip, lr}             \n\
         subs    r1, r1, #1                      \n\
         mcr     p15, 0, %0, c7, c14, 1          @ clean and invalidate D line\n\
-        add     r0, r0, #32                     \n\
+        add     %0, %0, #32                     \n\
         bne     1b                              \n\
         mcr     p15, 0, r1, c7, c10, 4          @ drain WB"
-        :
-        : "r" (kaddr), "I" (PAGE_SIZE / 32)
+        : "=r" (ptr)
+        : "0" (kaddr), "I" (PAGE_SIZE / 32)
         : "r1", "r2", "r3", "r4", "r5", "r6", "r7", "ip", "lr");
         kunmap_atomic(kaddr, KM_USER0);
 }
diff --git a/arch/arm/mm/copypage-v3.c b/arch/arm/mm/copypage-v3.c
index 13ce0baa6ba5..70ed96c8af8e 100644
--- a/arch/arm/mm/copypage-v3.c
+++ b/arch/arm/mm/copypage-v3.c
@@ -56,9 +56,9 @@ void v3_copy_user_highpage(struct page *to, struct page *from,
  */
 void v3_clear_user_highpage(struct page *page, unsigned long vaddr)
 {
-        void *kaddr = kmap_atomic(page, KM_USER0);
-        asm("\n\
-        mov     r1, %1                          @ 1\n\
+        void *ptr, *kaddr = kmap_atomic(page, KM_USER0);
+        asm volatile("\n\
+        mov     r1, %2                          @ 1\n\
         mov     r2, #0                          @ 1\n\
         mov     r3, #0                          @ 1\n\
         mov     ip, #0                          @ 1\n\
@@ -69,8 +69,8 @@ void v3_clear_user_highpage(struct page *page, unsigned long vaddr)
         stmia   %0!, {r2, r3, ip, lr}           @ 4\n\
         subs    r1, r1, #1                      @ 1\n\
         bne     1b                              @ 1"
-        :
-        : "r" (kaddr), "I" (PAGE_SIZE / 64)
+        : "=r" (ptr)
+        : "0" (kaddr), "I" (PAGE_SIZE / 64)
         : "r1", "r2", "r3", "ip", "lr");
         kunmap_atomic(kaddr, KM_USER0);
 }
diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c
index a5eae503a34f..bdb5fd983b15 100644
--- a/arch/arm/mm/copypage-v4mc.c
+++ b/arch/arm/mm/copypage-v4mc.c
@@ -93,9 +93,9 @@ void v4_mc_copy_user_highpage(struct page *from, struct page *to,
  */
 void v4_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, %0                          @ 1\n\
+        mov     r1, %2                          @ 1\n\
         mov     r2, #0                          @ 1\n\
         mov     r3, #0                          @ 1\n\
         mov     ip, #0                          @ 1\n\
@@ -108,8 +108,8 @@ void v4_mc_clear_user_highpage(struct page *page, unsigned long vaddr)
         stmia   %0!, {r2, r3, ip, lr}           @ 4\n\
         subs    r1, r1, #1                      @ 1\n\
         bne     1b                              @ 1"
-        :
-        : "r" (kaddr), "I" (PAGE_SIZE / 64)
+        : "=r" (ptr)
+        : "0" (kaddr), "I" (PAGE_SIZE / 64)
         : "r1", "r2", "r3", "ip", "lr");
         kunmap_atomic(kaddr, KM_USER0);
 }
diff --git a/arch/arm/mm/copypage-v4wb.c b/arch/arm/mm/copypage-v4wb.c
index 9144a96037bf..3ec93dab7656 100644
--- a/arch/arm/mm/copypage-v4wb.c
+++ b/arch/arm/mm/copypage-v4wb.c
@@ -66,9 +66,9 @@ void v4wb_copy_user_highpage(struct page *to, struct page *from,
  */
 void v4wb_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\
@@ -82,8 +82,8 @@ void v4wb_clear_user_highpage(struct page *page, unsigned long vaddr)
         subs    r1, r1, #1                      @ 1\n\
         bne     1b                              @ 1\n\
         mcr     p15, 0, r1, c7, c10, 4          @ 1   drain WB"
-        :
-        : "r" (kaddr), "I" (PAGE_SIZE / 64)
+        : "=r" (ptr)
+        : "0" (kaddr), "I" (PAGE_SIZE / 64)
         : "r1", "r2", "r3", "ip", "lr");
         kunmap_atomic(kaddr, KM_USER0);
 }
diff --git a/arch/arm/mm/copypage-v4wt.c b/arch/arm/mm/copypage-v4wt.c
index b8a345d6e77e..0f1188efae45 100644
--- 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);
 }
diff --git a/arch/arm/mm/copypage-xsc3.c b/arch/arm/mm/copypage-xsc3.c
index 0e7cb325ca4c..39a994542cad 100644
--- a/arch/arm/mm/copypage-xsc3.c
+++ b/arch/arm/mm/copypage-xsc3.c
@@ -89,9 +89,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 +101,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);
 }
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);
 }