summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-10 09:21:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-10 09:21:05 -0700
commit3644bc2ec7655a249612ea500e2be1c13052c4c2 (patch)
tree872dabd511e62b7e94f3d903d7b55114175f5b06 /include
parent6fad8d02ef9ab12d5e178014a4c5c297e1707f23 (diff)
parentc5ddd2024a87353f73068732cfd38d3dfec22e87 (diff)
downloadlinux-3644bc2ec7655a249612ea500e2be1c13052c4c2.tar.bz2
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 'include')
-rw-r--r--include/linux/compat.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h
index d53c35352ea9..7f0c1dd09079 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -673,6 +673,8 @@ int __compat_save_altstack(compat_stack_t __user *, unsigned long);
asmlinkage long compat_sys_sched_rr_get_interval(compat_pid_t pid,
struct compat_timespec __user *interval);
+asmlinkage long compat_sys_fanotify_mark(int, unsigned int, __u32, __u32,
+ int, const char __user *);
#else
#define is_compat_task() (0)