diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-16 20:09:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-16 20:09:30 +0300 |
| commit | 1c8e85b17ac0707c7732081e94cadc5f89986e5f (patch) | |
| tree | 3464e6a1dbb612e97f02bbbf299df95472b25c41 /arch/avr32/include/uapi/asm/unistd.h | |
| parent | 10dc3747661bea9215417b659449bb7b8ed3df2c (diff) | |
| parent | 392c5174499296bcdecbe1705d577883065fa5de (diff) | |
| download | linux-1c8e85b17ac0707c7732081e94cadc5f89986e5f.tar.xz | |
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
Diffstat (limited to 'arch/avr32/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/avr32/include/uapi/asm/unistd.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 */ |