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

Commit 20f7835c authored by Heiko Carstens's avatar Heiko Carstens
Browse files

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



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

arch/s390/kernel/compat_wrap.c

+10 −0
Original line number Diff line number Diff line
@@ -134,3 +134,13 @@ COMPAT_SYSCALL_WRAP1(timer_delete, compat_timer_t, compat_timer_id); 
COMPAT_SYSCALL_WRAP1(io_destroy, compat_aio_context_t, ctx);

COMPAT_SYSCALL_WRAP3(io_cancel, compat_aio_context_t, ctx_id, struct iocb __user *, iocb, struct io_event __user *, result);

COMPAT_SYSCALL_WRAP1(mq_unlink, const char __user *, name);

COMPAT_SYSCALL_WRAP5(add_key, const char __user *, tp, const char __user *, dsc, const void __user *, pld, compat_size_t, len, key_serial_t, id);

COMPAT_SYSCALL_WRAP4(request_key, const char __user *, tp, const char __user *, dsc, const char __user *, info, key_serial_t, id);

COMPAT_SYSCALL_WRAP5(remap_file_pages, u32, start, u32, size, u32, prot, u32, pgoff, u32, flags);

COMPAT_SYSCALL_WRAP3(ioprio_set, int, which, int, who, int, ioprio);

COMPAT_SYSCALL_WRAP2(ioprio_get, int, which, int, who);

COMPAT_SYSCALL_WRAP3(inotify_add_watch, int, fd, const char __user *, path, u32, mask);

COMPAT_SYSCALL_WRAP2(inotify_rm_watch, int, fd, __s32, wd);

COMPAT_SYSCALL_WRAP3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode);

COMPAT_SYSCALL_WRAP4(mknodat, int, dfd, const char __user *, filename, umode_t, mode, unsigned, dev);

COMPAT_SYSCALL_WRAP5(fchownat, int, dfd, const char __user *, filename, compat_uid_t, user, compat_gid_t, group, int, flag);

arch/s390/kernel/compat_wrapper.S

+0 −66
Original line number Diff line number Diff line
@@ -286,29 +286,6 @@ ENTRY(compat_sys_mq_getsetattr_wrapper) 
	llgtr	%r4,%r4			# struct compat_mq_attr *

	jg	compat_sys_mq_getsetattr



ENTRY(compat_sys_add_key_wrapper)

	llgtr	%r2,%r2			# const char *

	llgtr	%r3,%r3			# const char *

	llgtr	%r4,%r4			# const void *

	llgfr	%r5,%r5			# size_t

	llgfr	%r6,%r6			# (key_serial_t) u32

	jg	sys_add_key



ENTRY(compat_sys_request_key_wrapper)

	llgtr	%r2,%r2			# const char *

	llgtr	%r3,%r3			# const char *

	llgtr	%r4,%r4			# const void *

	llgfr	%r5,%r5			# (key_serial_t) u32

	jg	sys_request_key



ENTRY(sys32_remap_file_pages_wrapper)

	llgfr	%r2,%r2			# unsigned long

	llgfr	%r3,%r3			# unsigned long

	llgfr	%r4,%r4			# unsigned long

	llgfr	%r5,%r5			# unsigned long

	llgfr	%r6,%r6			# unsigned long

	jg	sys_remap_file_pages



ENTRY(compat_sys_kexec_load_wrapper)

	llgfr	%r2,%r2			# unsigned long

	llgfr	%r3,%r3			# unsigned long
@@ -316,49 +293,6 @@ ENTRY(compat_sys_kexec_load_wrapper) 
	llgfr	%r5,%r5			# unsigned long

	jg	compat_sys_kexec_load



ENTRY(sys_ioprio_set_wrapper)

	lgfr	%r2,%r2			# int

	lgfr	%r3,%r3			# int

	lgfr	%r4,%r4			# int

	jg	sys_ioprio_set



ENTRY(sys_ioprio_get_wrapper)

	lgfr	%r2,%r2			# int

	lgfr	%r3,%r3			# int

	jg	sys_ioprio_get



ENTRY(sys_inotify_add_watch_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# const char *

	llgfr	%r4,%r4			# u32

	jg	sys_inotify_add_watch



ENTRY(sys_inotify_rm_watch_wrapper)

	lgfr	%r2,%r2			# int

	llgfr	%r3,%r3			# u32

	jg	sys_inotify_rm_watch



ENTRY(sys_mkdirat_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# const char *

	lgfr	%r4,%r4			# int

	jg	sys_mkdirat



ENTRY(sys_mknodat_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# const char *

	lgfr	%r4,%r4			# int

	llgfr	%r5,%r5			# unsigned int

	jg	sys_mknodat



ENTRY(sys_fchownat_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# const char *

	llgfr	%r4,%r4			# uid_t

	llgfr	%r5,%r5			# gid_t

	lgfr	%r6,%r6			# int

	jg	sys_fchownat



ENTRY(compat_sys_futimesat_wrapper)

	llgfr	%r2,%r2			# unsigned int

	llgtr	%r3,%r3			# char *

arch/s390/kernel/syscalls.S

+10 −10
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ NI_SYSCALL /* reserved for vserver */ 
SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,compat_sys_s390_fadvise64_64)

SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)

SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)

SYSCALL(sys_remap_file_pages,sys_remap_file_pages,sys32_remap_file_pages_wrapper)

SYSCALL(sys_remap_file_pages,sys_remap_file_pages,compat_sys_remap_file_pages)

NI_SYSCALL							/* 268 sys_mbind */

NI_SYSCALL							/* 269 sys_get_mempolicy */

NI_SYSCALL							/* 270 sys_set_mempolicy */
@@ -286,20 +286,20 @@ SYSCALL(sys_mq_timedreceive,sys_mq_timedreceive,compat_sys_mq_timedreceive_wrapp 
SYSCALL(sys_mq_notify,sys_mq_notify,compat_sys_mq_notify_wrapper) /* 275 */

SYSCALL(sys_mq_getsetattr,sys_mq_getsetattr,compat_sys_mq_getsetattr_wrapper)

SYSCALL(sys_kexec_load,sys_kexec_load,compat_sys_kexec_load_wrapper)

SYSCALL(sys_add_key,sys_add_key,compat_sys_add_key_wrapper)

SYSCALL(sys_request_key,sys_request_key,compat_sys_request_key_wrapper)

SYSCALL(sys_add_key,sys_add_key,compat_sys_add_key)

SYSCALL(sys_request_key,sys_request_key,compat_sys_request_key)

SYSCALL(sys_keyctl,sys_keyctl,compat_sys_keyctl_wrapper)		/* 280 */

SYSCALL(sys_waitid,sys_waitid,compat_sys_waitid)

SYSCALL(sys_ioprio_set,sys_ioprio_set,sys_ioprio_set_wrapper)

SYSCALL(sys_ioprio_get,sys_ioprio_get,sys_ioprio_get_wrapper)

SYSCALL(sys_ioprio_set,sys_ioprio_set,compat_sys_ioprio_set)

SYSCALL(sys_ioprio_get,sys_ioprio_get,compat_sys_ioprio_get)

SYSCALL(sys_inotify_init,sys_inotify_init,sys_inotify_init)

SYSCALL(sys_inotify_add_watch,sys_inotify_add_watch,sys_inotify_add_watch_wrapper)	/* 285 */

SYSCALL(sys_inotify_rm_watch,sys_inotify_rm_watch,sys_inotify_rm_watch_wrapper)

SYSCALL(sys_inotify_add_watch,sys_inotify_add_watch,compat_sys_inotify_add_watch)	/* 285 */

SYSCALL(sys_inotify_rm_watch,sys_inotify_rm_watch,compat_sys_inotify_rm_watch)

NI_SYSCALL							/* 287 sys_migrate_pages */

SYSCALL(sys_openat,sys_openat,compat_sys_openat)

SYSCALL(sys_mkdirat,sys_mkdirat,sys_mkdirat_wrapper)

SYSCALL(sys_mknodat,sys_mknodat,sys_mknodat_wrapper)	/* 290 */

SYSCALL(sys_fchownat,sys_fchownat,sys_fchownat_wrapper)

SYSCALL(sys_mkdirat,sys_mkdirat,compat_sys_mkdirat)

SYSCALL(sys_mknodat,sys_mknodat,compat_sys_mknodat)	/* 290 */

SYSCALL(sys_fchownat,sys_fchownat,compat_sys_fchownat)

SYSCALL(sys_futimesat,sys_futimesat,compat_sys_futimesat_wrapper)

SYSCALL(sys_fstatat64,sys_newfstatat,compat_sys_s390_fstatat64)

SYSCALL(sys_unlinkat,sys_unlinkat,sys_unlinkat_wrapper)