Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c8e85b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 10dc3747 392c5174

arch/avr32/include/asm/cmpxchg.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

arch/avr32/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

arch/avr32/kernel/syscall-stubs.S

+9 −0
Original line number Diff line number Diff line
@@ -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

arch/avr32/kernel/syscall_table.S

+1 −0
Original line number Diff line number Diff line
@@ -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 */