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

Commit d5dc77bf authored by Al Viro's avatar Al Viro
Browse files

consolidate compat lookup_dcookie() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 76b021d0

arch/arm64/kernel/sys32.S

+0 −7
Original line number Diff line number Diff line
@@ -84,13 +84,6 @@ compat_sys_readahead_wrapper: 
	b	sys_readahead

ENDPROC(compat_sys_readahead_wrapper)



compat_sys_lookup_dcookie:

	orr	x0, x0, x1, lsl #32

	mov	w1, w2

	mov	w2, w3

	b	sys_lookup_dcookie

ENDPROC(compat_sys_lookup_dcookie)



compat_sys_fadvise64_64_wrapper:

	mov	w6, w1

	orr	x1, x2, x3, lsl #32

arch/mips/kernel/linux32.c

+0 −6
Original line number Diff line number Diff line
@@ -259,12 +259,6 @@ asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_a2, 
			     merge_64(len_a4, len_a5));

}



asmlinkage long sys32_lookup_dcookie(u32 a0, u32 a1, char __user *buf,

	size_t len)

{

	return sys_lookup_dcookie(merge_64(a0, a1), buf, len);

}



SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags,

		u64, a3, u64, a4, int, dfd, const char	__user *, pathname)

{

arch/mips/kernel/scall64-o32.S

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ sys_call_table: 
	PTR	compat_sys_io_submit

	PTR	sys_io_cancel			/* 4245 */

	PTR	sys_exit_group

	PTR	sys32_lookup_dcookie

	PTR	compat_sys_lookup_dcookie

	PTR	sys_epoll_create

	PTR	sys_epoll_ctl

	PTR	sys_epoll_wait			/* 4250 */

arch/parisc/kernel/sys_parisc32.c

+0 −7
Original line number Diff line number Diff line
@@ -75,13 +75,6 @@ asmlinkage long sys32_semctl(int semid, int semnum, int cmd, union semun arg) 
	return sys_semctl (semid, semnum, cmd, arg);

}



long sys32_lookup_dcookie(u32 cookie_high, u32 cookie_low, char __user *buf,

			  size_t len)

{

	return sys_lookup_dcookie((u64)cookie_high << 32 | cookie_low,

				  buf, len);

}



asmlinkage long compat_sys_fanotify_mark(int fan_fd, int flags, u32 mask_hi,

					 u32 mask_lo, int fd,

					 const char __user *pathname)

arch/parisc/kernel/syscall_table.S

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ 
	ENTRY_SAME(alloc_hugepages)	/* 220 */

	ENTRY_SAME(free_hugepages)

	ENTRY_SAME(exit_group)

	ENTRY_DIFF(lookup_dcookie)

	ENTRY_COMP(lookup_dcookie)

	ENTRY_SAME(epoll_create)

	ENTRY_SAME(epoll_ctl)		/* 225 */

	ENTRY_SAME(epoll_wait)