diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-18 12:50:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-18 12:50:55 -0800 |
| commit | d90f351a9bec6af3e8e7cefbbff94072461c3c9a (patch) | |
| tree | 71db07e8820b63a60fefcd7e3d1f044450a4b55d /arch/avr32/include | |
| parent | c1a198d9235b9e7d6942027374e44f78ebdcb455 (diff) | |
| parent | 238d1c6041ebcb5ce7c075b696f6cc9962991e94 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 updates from Hans-Christian Noren Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
mmc: atmel: get rid of struct mci_dma_data
mmc: atmel-mci: restore dma on AVR32
avr32: wire up missing syscalls
avr32: wire up accept4 syscall
Diffstat (limited to 'arch/avr32/include')
| -rw-r--r-- | arch/avr32/include/uapi/asm/unistd.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/avr32/include/uapi/asm/unistd.h b/arch/avr32/include/uapi/asm/unistd.h index bbe2fba565cd..b60132bb27ea 100644 --- a/arch/avr32/include/uapi/asm/unistd.h +++ b/arch/avr32/include/uapi/asm/unistd.h @@ -333,5 +333,9 @@ #define __NR_memfd_create 318 #define __NR_bpf 319 #define __NR_execveat 320 +#define __NR_accept4 321 +#define __NR_userfaultfd 322 +#define __NR_membarrier 323 +#define __NR_mlock2 324 #endif /* _UAPI__ASM_AVR32_UNISTD_H */ |