Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3644bc2e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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(...)
parents 6fad8d02 c5ddd202

arch/arm64/include/asm/unistd32.h

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ __SYSCALL(364, sys_perf_event_open) 
__SYSCALL(365, compat_sys_recvmmsg)

__SYSCALL(366, sys_accept4)

__SYSCALL(367, sys_fanotify_init)

__SYSCALL(368, compat_sys_fanotify_mark_wrapper)

__SYSCALL(368, compat_sys_fanotify_mark)

__SYSCALL(369, sys_prlimit64)

__SYSCALL(370, sys_name_to_handle_at)

__SYSCALL(371, compat_sys_open_by_handle_at)

arch/arm64/kernel/sys32.S

+0 −7
Original line number Diff line number Diff line
@@ -104,13 +104,6 @@ compat_sys_fallocate_wrapper: 
	b	sys_fallocate

ENDPROC(compat_sys_fallocate_wrapper)



compat_sys_fanotify_mark_wrapper:

	orr	x2, x2, x3, lsl #32

	mov	w3, w4

	mov	w4, w5

	b	sys_fanotify_mark

ENDPROC(compat_sys_fanotify_mark_wrapper)



#undef __SYSCALL

#define __SYSCALL(x, y)		.quad	y	// x

arch/mips/kernel/linux32.c

+0 −7
Original line number Diff line number Diff line
@@ -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);

}

arch/mips/kernel/scall64-o32.S

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/parisc/kernel/sys_parisc32.c

+0 −8
Original line number Diff line number Diff line
@@ -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);

}