projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
[cascardo/linux.git]
/
arch
/
arm
/
kernel
/
calls.S
diff --git
a/arch/arm/kernel/calls.S
b/arch/arm/kernel/calls.S
index
7fbf28c
..
80f7896
100644
(file)
--- a/
arch/arm/kernel/calls.S
+++ b/
arch/arm/kernel/calls.S
@@
-383,6
+383,8
@@
CALL(sys_open_by_handle_at)
CALL(sys_clock_adjtime)
CALL(sys_syncfs)
+ CALL(sys_sendmmsg)
+/* 375 */ CALL(sys_setns)
#ifndef syscalls_counted
.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
#define syscalls_counted