diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 16:14:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 16:14:47 +1000 |
| commit | 1dec33f16969b92c40f1407b319064b1e137495d (patch) | |
| tree | a7723e5ab2f6961afa2ded6a48251dc0bb6f205e /arch/arm/kernel/calls.S | |
| parent | 6f1ed50023a9096d5c2b3dc0fa747376a0680b3b (diff) | |
| parent | 103ae675b12dee75ec099abf3d22857d1384b3bc (diff) | |
Merge remote-tracking branch 'security/next'
Conflicts:
kernel/seccomp.c
Diffstat (limited to 'arch/arm/kernel/calls.S')
| -rw-r--r-- | arch/arm/kernel/calls.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 8f51bdcdacbb..bea85f97f363 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -392,6 +392,7 @@ /* 380 */ CALL(sys_sched_setattr) CALL(sys_sched_getattr) CALL(sys_renameat2) + CALL(sys_seccomp) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls #define syscalls_counted |