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
This commit is contained in:
commit
1c8e85b17a
|
@ -57,7 +57,7 @@ static inline unsigned long __cmpxchg_u32(volatile int *m, unsigned long old,
|
||||||
" brne 1b\n"
|
" brne 1b\n"
|
||||||
"2:\n"
|
"2:\n"
|
||||||
: [ret] "=&r"(ret), [m] "=m"(*m)
|
: [ret] "=&r"(ret), [m] "=m"(*m)
|
||||||
: "m"(m), [old] "ir"(old), [new] "r"(new)
|
: "m"(m), [old] "Ks21r"(old), [new] "r"(new)
|
||||||
: "memory", "cc");
|
: "memory", "cc");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -337,5 +337,6 @@
|
||||||
#define __NR_userfaultfd 322
|
#define __NR_userfaultfd 322
|
||||||
#define __NR_membarrier 323
|
#define __NR_membarrier 323
|
||||||
#define __NR_mlock2 324
|
#define __NR_mlock2 324
|
||||||
|
#define __NR_copy_file_range 325
|
||||||
|
|
||||||
#endif /* _UAPI__ASM_AVR32_UNISTD_H */
|
#endif /* _UAPI__ASM_AVR32_UNISTD_H */
|
||||||
|
|
|
@ -124,3 +124,12 @@ __sys_process_vm_writev:
|
||||||
call sys_process_vm_writev
|
call sys_process_vm_writev
|
||||||
sub sp, -4
|
sub sp, -4
|
||||||
popm pc
|
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
|
||||||
|
|
|
@ -338,4 +338,5 @@ sys_call_table:
|
||||||
.long sys_userfaultfd
|
.long sys_userfaultfd
|
||||||
.long sys_membarrier
|
.long sys_membarrier
|
||||||
.long sys_mlock2
|
.long sys_mlock2
|
||||||
|
.long __sys_copy_file_range /* 325 */
|
||||||
.long sys_ni_syscall /* r8 is saturated at nr_syscalls */
|
.long sys_ni_syscall /* r8 is saturated at nr_syscalls */
|
||||||
|
|
Loading…
Reference in a new issue