diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-30 00:16:12 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-30 00:16:12 (GMT) |
| commit | ad0b40fa944628d6f30b40266a599b285d70a266 (patch) | |
| tree | 988262db8c25a94dbacf0312330df81668b0bb83 /arch/arm/kernel/calls.S | |
| parent | ec1cc55d6fa0b34029419634125fadc77dce1e88 (diff) | |
| parent | 03590cb56d5df7367ccb9e6e0127593254401c42 (diff) | |
| download | linux-ad0b40fa944628d6f30b40266a599b285d70a266.tar.xz | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Just one fix for a -fstack-protector-strong problem from Kees Cook,
and adding the new copy_file_range syscall"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: wire up copy_file_range() syscall
ARM: 8500/1: fix atags_to_fdt with stack-protector-strong
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 ac368bb..dfc7cd6 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -400,6 +400,7 @@ CALL(sys_userfaultfd) CALL(sys_membarrier) CALL(sys_mlock2) + CALL(sys_copy_file_range) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls #define syscalls_counted |