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

Commit 18421166 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/compat: convert system call wrappers to C part 10 



Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 24e4c2aa

arch/s390/kernel/compat_wrap.c

+10 −0
Original line number Diff line number Diff line
@@ -114,3 +114,13 @@ COMPAT_SYSCALL_WRAP3(madvise, compat_ulong_t, start, compat_size_t, len, int, be 
COMPAT_SYSCALL_WRAP5(setxattr, const char __user *, path, const char __user *, name, const void __user *, value, compat_size_t, size, int, flags);

COMPAT_SYSCALL_WRAP5(lsetxattr, const char __user *, path, const char __user *, name, const void __user *, value, compat_size_t, size, int, flags);

COMPAT_SYSCALL_WRAP5(fsetxattr, int, fd, const char __user *, name, const void __user *, value, compat_size_t, size, int, flags);

COMPAT_SYSCALL_WRAP3(getdents64, unsigned int, fd, struct linux_dirent64 __user *, dirent, unsigned int, count);

COMPAT_SYSCALL_WRAP4(getxattr, const char __user *, path, const char __user *, name, void __user *, value, compat_size_t, size);

COMPAT_SYSCALL_WRAP4(lgetxattr, const char __user *, path, const char __user *, name, void __user *, value, compat_size_t, size);

COMPAT_SYSCALL_WRAP4(fgetxattr, int, fd, const char __user *, name, void __user *, value, compat_size_t, size);

COMPAT_SYSCALL_WRAP3(listxattr, const char __user *, path, char __user *, list, compat_size_t, size);

COMPAT_SYSCALL_WRAP3(llistxattr, const char __user *, path, char __user *, list, compat_size_t, size);

COMPAT_SYSCALL_WRAP3(flistxattr, int, fd, char __user *, list, compat_size_t, size);

COMPAT_SYSCALL_WRAP2(removexattr, const char __user *, path, const char __user *, name);

COMPAT_SYSCALL_WRAP2(lremovexattr, const char __user *, path, const char __user *, name);

COMPAT_SYSCALL_WRAP2(fremovexattr, int, fd, const char __user *, name);

arch/s390/kernel/compat_wrapper.S

+0 −60
Original line number Diff line number Diff line
@@ -159,12 +159,6 @@ ENTRY(compat_sys_nanosleep_wrapper) 
	llgtr	%r3,%r3			# struct compat_timespec *

	jg	compat_sys_nanosleep		# branch to system call



ENTRY(sys32_getdents64_wrapper)

	llgfr	%r2,%r2			# unsigned int

	llgtr	%r3,%r3			# void *

	llgfr	%r4,%r4			# unsigned int

	jg	sys_getdents64		# branch to system call



ENTRY(compat_sys_fcntl64_wrapper)

	llgfr	%r2,%r2			# unsigned int

	llgfr	%r3,%r3			# unsigned int
@@ -175,60 +169,6 @@ ENTRY(sys32_stime_wrapper) 
	llgtr	%r2,%r2			# long *

	jg	compat_sys_stime	# branch to system call



ENTRY(sys32_getxattr_wrapper)

	llgtr	%r2,%r2			# char *

	llgtr	%r3,%r3			# char *

	llgtr	%r4,%r4			# void *

	llgfr	%r5,%r5			# size_t

	jg	sys_getxattr



ENTRY(sys32_lgetxattr_wrapper)

	llgtr	%r2,%r2			# char *

	llgtr	%r3,%r3			# char *

	llgtr	%r4,%r4			# void *

	llgfr	%r5,%r5			# size_t

	jg	sys_lgetxattr



ENTRY(sys32_fgetxattr_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# char *

	llgtr	%r4,%r4			# void *

	llgfr	%r5,%r5			# size_t

	jg	sys_fgetxattr



ENTRY(sys32_listxattr_wrapper)

	llgtr	%r2,%r2			# char *

	llgtr	%r3,%r3			# char *

	llgfr	%r4,%r4			# size_t

	jg	sys_listxattr



ENTRY(sys32_llistxattr_wrapper)

	llgtr	%r2,%r2			# char *

	llgtr	%r3,%r3			# char *

	llgfr	%r4,%r4			# size_t

	jg	sys_llistxattr



ENTRY(sys32_flistxattr_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# char *

	llgfr	%r4,%r4			# size_t

	jg	sys_flistxattr



ENTRY(sys32_removexattr_wrapper)

	llgtr	%r2,%r2			# char *

	llgtr	%r3,%r3			# char *

	jg	sys_removexattr



ENTRY(sys32_lremovexattr_wrapper)

	llgtr	%r2,%r2			# char *

	llgtr	%r3,%r3			# char *

	jg	sys_lremovexattr



ENTRY(sys32_fremovexattr_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# char *

	jg	sys_fremovexattr



ENTRY(sys32_sched_setaffinity_wrapper)

	lgfr	%r2,%r2			# int

	llgfr	%r3,%r3			# unsigned int

arch/s390/kernel/syscalls.S

+10 −10
Original line number Diff line number Diff line
@@ -228,22 +228,22 @@ SYSCALL(sys_setfsgid,sys_setfsgid,compat_sys_setfsgid) 
SYSCALL(sys_pivot_root,sys_pivot_root,compat_sys_pivot_root)

SYSCALL(sys_mincore,sys_mincore,compat_sys_mincore)

SYSCALL(sys_madvise,sys_madvise,compat_sys_madvise)

SYSCALL(sys_getdents64,sys_getdents64,sys32_getdents64_wrapper)	/* 220 */

SYSCALL(sys_getdents64,sys_getdents64,compat_sys_getdents64)	/* 220 */

SYSCALL(sys_fcntl64,sys_ni_syscall,compat_sys_fcntl64_wrapper)

SYSCALL(sys_readahead,sys_readahead,compat_sys_s390_readahead)

SYSCALL(sys_sendfile64,sys_ni_syscall,compat_sys_sendfile64)

SYSCALL(sys_setxattr,sys_setxattr,compat_sys_setxattr)

SYSCALL(sys_lsetxattr,sys_lsetxattr,compat_sys_lsetxattr)	/* 225 */

SYSCALL(sys_fsetxattr,sys_fsetxattr,compat_sys_fsetxattr)

SYSCALL(sys_getxattr,sys_getxattr,sys32_getxattr_wrapper)

SYSCALL(sys_lgetxattr,sys_lgetxattr,sys32_lgetxattr_wrapper)

SYSCALL(sys_fgetxattr,sys_fgetxattr,sys32_fgetxattr_wrapper)

SYSCALL(sys_listxattr,sys_listxattr,sys32_listxattr_wrapper)	/* 230 */

SYSCALL(sys_llistxattr,sys_llistxattr,sys32_llistxattr_wrapper)

SYSCALL(sys_flistxattr,sys_flistxattr,sys32_flistxattr_wrapper)

SYSCALL(sys_removexattr,sys_removexattr,sys32_removexattr_wrapper)

SYSCALL(sys_lremovexattr,sys_lremovexattr,sys32_lremovexattr_wrapper)

SYSCALL(sys_fremovexattr,sys_fremovexattr,sys32_fremovexattr_wrapper)	/* 235 */

SYSCALL(sys_getxattr,sys_getxattr,compat_sys_getxattr)

SYSCALL(sys_lgetxattr,sys_lgetxattr,compat_sys_lgetxattr)

SYSCALL(sys_fgetxattr,sys_fgetxattr,compat_sys_fgetxattr)

SYSCALL(sys_listxattr,sys_listxattr,compat_sys_listxattr)	/* 230 */

SYSCALL(sys_llistxattr,sys_llistxattr,compat_sys_llistxattr)

SYSCALL(sys_flistxattr,sys_flistxattr,compat_sys_flistxattr)

SYSCALL(sys_removexattr,sys_removexattr,compat_sys_removexattr)

SYSCALL(sys_lremovexattr,sys_lremovexattr,compat_sys_lremovexattr)

SYSCALL(sys_fremovexattr,sys_fremovexattr,compat_sys_fremovexattr)	/* 235 */

SYSCALL(sys_gettid,sys_gettid,sys_gettid)

SYSCALL(sys_tkill,sys_tkill,sys_tkill_wrapper)

SYSCALL(sys_futex,sys_futex,compat_sys_futex)