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/parisc | |
| 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/parisc')
| -rw-r--r-- | arch/parisc/kernel/sys_parisc32.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c index f517e08e7f0d..a134ff4da12e 100644 --- a/arch/parisc/kernel/sys_parisc32.c +++ b/arch/parisc/kernel/sys_parisc32.c @@ -59,11 +59,3 @@ asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23, current->comm, current->pid, r20); return -ENOSYS; } - -asmlinkage long compat_sys_fanotify_mark(int fan_fd, int flags, u32 mask_hi, - u32 mask_lo, int fd, - const char __user *pathname) -{ - return sys_fanotify_mark(fan_fd, flags, ((u64)mask_hi << 32) | mask_lo, - fd, pathname); -} |