diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 21:28:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-18 21:28:28 +0200 |
| commit | 5614e7725856ea383f458377980298111439e0fb (patch) | |
| tree | 82560034c3a17ee18073420406ba1228935e2967 /arch/arm/kernel/calls.S | |
| parent | devcoredump: add scatterlist support (diff) | |
| parent | Linux 4.6-rc4 (diff) | |
| download | linux-5614e7725856ea383f458377980298111439e0fb.tar.xz linux-5614e7725856ea383f458377980298111439e0fb.zip | |
Merge 4.6-rc4 into driver-core-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/kernel/calls.S')
| -rw-r--r-- | arch/arm/kernel/calls.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index dfc7cd6851ad..703fa0f3cd8f 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -399,8 +399,10 @@ CALL(sys_execveat) CALL(sys_userfaultfd) CALL(sys_membarrier) - CALL(sys_mlock2) +/* 390 */ CALL(sys_mlock2) CALL(sys_copy_file_range) + CALL(sys_preadv2) + CALL(sys_pwritev2) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls #define syscalls_counted |