diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 18:21:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 18:21:05 +0200 |
| commit | 3644bc2ec7655a249612ea500e2be1c13052c4c2 (patch) | |
| tree | 872dabd511e62b7e94f3d903d7b55114175f5b06 /arch/powerpc | |
| parent | Merge tag 'ecryptfs-3.10-rc1-ablkcipher' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | switch compat_sys_sysctl to COMPAT_SYSCALL_DEFINE (diff) | |
| download | linux-3644bc2ec7655a249612ea500e2be1c13052c4c2.tar.xz linux-3644bc2ec7655a249612ea500e2be1c13052c4c2.zip | |
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/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/sys_ppc32.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index cd6e19d263b3..8a285876aef8 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c @@ -126,11 +126,3 @@ asmlinkage long compat_sys_sync_file_range2(int fd, unsigned int flags, return sys_sync_file_range(fd, offset, nbytes, flags); } - -asmlinkage long compat_sys_fanotify_mark(int fanotify_fd, unsigned int flags, - unsigned mask_hi, unsigned mask_lo, - int dfd, const char __user *pathname) -{ - u64 mask = ((u64)mask_hi << 32) | mask_lo; - return sys_fanotify_mark(fanotify_fd, flags, mask, dfd, pathname); -} |