summaryrefslogtreecommitdiffstats
path: root/arch/avr32/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-18 12:50:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-18 12:50:55 -0800
commitd90f351a9bec6af3e8e7cefbbff94072461c3c9a (patch)
tree71db07e8820b63a60fefcd7e3d1f044450a4b55d /arch/avr32/kernel
parentc1a198d9235b9e7d6942027374e44f78ebdcb455 (diff)
parent238d1c6041ebcb5ce7c075b696f6cc9962991e94 (diff)
downloadlinux-d90f351a9bec6af3e8e7cefbbff94072461c3c9a.tar.gz
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/kernel')
-rw-r--r--arch/avr32/kernel/syscall_table.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index c3b593b..1915a443 100644
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -334,4 +334,8 @@ sys_call_table:
.long sys_memfd_create
.long sys_bpf
.long sys_execveat /* 320 */
+ .long sys_accept4
+ .long sys_userfaultfd
+ .long sys_membarrier
+ .long sys_mlock2
.long sys_ni_syscall /* r8 is saturated at nr_syscalls */