mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
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(...)
This commit is contained in:
commit
3644bc2ec7
20 changed files with 45 additions and 107 deletions
|
|
@ -165,10 +165,3 @@ asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_a2,
|
|||
return sys_fallocate(fd, mode, merge_64(offset_a2, offset_a3),
|
||||
merge_64(len_a4, len_a5));
|
||||
}
|
||||
|
||||
SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags,
|
||||
u64, a3, u64, a4, int, dfd, const char __user *, pathname)
|
||||
{
|
||||
return sys_fanotify_mark(fanotify_fd, flags, merge_64(a3, a4),
|
||||
dfd, pathname);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -529,7 +529,7 @@ sys_call_table:
|
|||
PTR sys_accept4
|
||||
PTR compat_sys_recvmmsg /* 4335 */
|
||||
PTR sys_fanotify_init
|
||||
PTR sys_32_fanotify_mark
|
||||
PTR compat_sys_fanotify_mark
|
||||
PTR sys_prlimit64
|
||||
PTR sys_name_to_handle_at
|
||||
PTR compat_sys_open_by_handle_at /* 4340 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue