Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32

Pull AVR32 updates from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: fix asm operand constraint in cmpxchg()
  avr32: wire up copy_file_range syscall

4 files changed, 12 insertions, 1 deletions

diff --git a/arch/avr32/include/asm/cmpxchg.h b/arch/avr32/include/asm/cmpxchg.h
index 366bbeaeb405..572739b4c4b4 100644
--- a/arch/avr32/include/asm/cmpxchg.h
+++ b/arch/avr32/include/asm/cmpxchg.h
@@ -57,7 +57,7 @@ static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
                 "       brne    1b\n"
                 "2:\n"
                 : [ret] "=&r"(ret), [m] "=m"(*m)
-                : "m"(m), [old] "ir"(old), [new] "r"(new)
+                : "m"(m), [old] "Ks21r"(old), [new] "r"(new)
                 : "memory", "cc");
         return ret;
 }
diff --git a/arch/avr32/include/uapi/asm/unistd.h b/arch/avr32/include/uapi/asm/unistd.h
index b60132bb27ea..60c0f3afc1f9 100644
--- a/arch/avr32/include/uapi/asm/unistd.h
+++ b/arch/avr32/include/uapi/asm/unistd.h
@@ -337,5 +337,6 @@
 #define __NR_userfaultfd        322
 #define __NR_membarrier         323
 #define __NR_mlock2             324
+#define __NR_copy_file_range    325
 
 #endif /* _UAPI__ASM_AVR32_UNISTD_H */
diff --git a/arch/avr32/kernel/syscall-stubs.S b/arch/avr32/kernel/syscall-stubs.S
index f9c68fab0e2f..cb3991552f14 100644
--- a/arch/avr32/kernel/syscall-stubs.S
+++ b/arch/avr32/kernel/syscall-stubs.S
@@ -124,3 +124,12 @@ __sys_process_vm_writev:
         call    sys_process_vm_writev
         sub     sp, -4
         popm    pc
+
+        .global __sys_copy_file_range
+        .type   __sys_copy_file_range,@function
+__sys_copy_file_range:
+        pushm   lr
+        st.w    --sp, ARG6
+        call    sys_copy_file_range
+        sub     sp, -4
+        popm    pc
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index 1915a443b491..64d71a781fa8 100644
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -338,4 +338,5 @@ sys_call_table:
         .long   sys_userfaultfd
         .long   sys_membarrier
         .long   sys_mlock2
+        .long   __sys_copy_file_range   /* 325 */
         .long   sys_ni_syscall          /* r8 is saturated at nr_syscalls */