aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-10 12:21:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-10 12:21:05 -0400
commit3644bc2ec7655a249612ea500e2be1c13052c4c2 (patch)
tree872dabd511e62b7e94f3d903d7b55114175f5b06 /arch/arm64/include
parent6fad8d02ef9ab12d5e178014a4c5c297e1707f23 (diff)
parentc5ddd2024a87353f73068732cfd38d3dfec22e87 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull stray syscall bits from Al Viro: "Several syscall-related commits that were missing from the original" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: switch compat_sys_sysctl to COMPAT_SYSCALL_DEFINE unicore32: just use mmap_pgoff()... unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE x86, vm86: fix VM86 syscalls: use SYSCALL_DEFINEx(...)
Diffstat (limited to 'arch/arm64/include')
-rw-r--r--arch/arm64/include/asm/unistd32.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index 12f22492df4c..58125bf008d3 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -389,7 +389,7 @@ __SYSCALL(364, sys_perf_event_open)
389__SYSCALL(365, compat_sys_recvmmsg) 389__SYSCALL(365, compat_sys_recvmmsg)
390__SYSCALL(366, sys_accept4) 390__SYSCALL(366, sys_accept4)
391__SYSCALL(367, sys_fanotify_init) 391__SYSCALL(367, sys_fanotify_init)
392__SYSCALL(368, compat_sys_fanotify_mark_wrapper) 392__SYSCALL(368, compat_sys_fanotify_mark)
393__SYSCALL(369, sys_prlimit64) 393__SYSCALL(369, sys_prlimit64)
394__SYSCALL(370, sys_name_to_handle_at) 394__SYSCALL(370, sys_name_to_handle_at)
395__SYSCALL(371, compat_sys_open_by_handle_at) 395__SYSCALL(371, compat_sys_open_by_handle_at)