diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 16:21:05 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 16:21:05 (GMT) |
commit | 3644bc2ec7655a249612ea500e2be1c13052c4c2 (patch) | |
tree | 872dabd511e62b7e94f3d903d7b55114175f5b06 /kernel/sys_ni.c | |
parent | 6fad8d02ef9ab12d5e178014a4c5c297e1707f23 (diff) | |
parent | c5ddd2024a87353f73068732cfd38d3dfec22e87 (diff) | |
download | linux-fsl-qoriq-3644bc2ec7655a249612ea500e2be1c13052c4c2.tar.xz |
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 'kernel/sys_ni.c')
-rw-r--r-- | kernel/sys_ni.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index bfd6787..7078052 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -200,6 +200,7 @@ cond_syscall(sys_perf_event_open); /* fanotify! */ cond_syscall(sys_fanotify_init); cond_syscall(sys_fanotify_mark); +cond_syscall(compat_sys_fanotify_mark); /* open by handle */ cond_syscall(sys_name_to_handle_at); |