s390/compat: convert system call wrappers to C part 13 (28798abc) · Commits · e / devices / android_kernel_samsung_universal8895

arch/s390/kernel/compat_wrap.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -144,3 +144,13 @@ 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);
		COMPAT_SYSCALL_WRAP3(unlinkat, int, dfd, const char __user *, pathname, int, flag);
		COMPAT_SYSCALL_WRAP4(renameat, int, olddfd, const char __user , oldname, int, newdfd, const char __user , newname);
		COMPAT_SYSCALL_WRAP5(linkat, int, olddfd, const char __user , oldname, int, newdfd, const char __user , newname, int, flags);
		COMPAT_SYSCALL_WRAP3(symlinkat, const char __user , oldname, int, newdfd, const char __user , newname);
		COMPAT_SYSCALL_WRAP4(readlinkat, int, dfd, const char __user , path, char __user , buf, int, bufsiz);
		COMPAT_SYSCALL_WRAP3(fchmodat, int, dfd, const char __user *, filename, umode_t, mode);
		COMPAT_SYSCALL_WRAP3(faccessat, int, dfd, const char __user *, filename, int, mode);
		COMPAT_SYSCALL_WRAP1(unshare, compat_ulong_t, unshare_flags);
		COMPAT_SYSCALL_WRAP6(splice, int, fd_in, loff_t __user , off_in, int, fd_out, loff_t __user , off_out, compat_size_t, len, unsigned int, flags);
		COMPAT_SYSCALL_WRAP4(tee, int, fdin, int, fdout, compat_size_t, len, unsigned int, flags);

arch/s390/kernel/compat_wrapper.S

+0 −67

Original line number	Diff line number	Diff line
		@@ -299,52 +299,6 @@ ENTRY(compat_sys_futimesat_wrapper)
		llgtr %r4,%r4 # struct timeval *
		jg compat_sys_futimesat

		ENTRY(sys_unlinkat_wrapper)
		lgfr %r2,%r2 # int
		llgtr %r3,%r3 # const char *
		lgfr %r4,%r4 # int
		jg sys_unlinkat

		ENTRY(sys_renameat_wrapper)
		lgfr %r2,%r2 # int
		llgtr %r3,%r3 # const char *
		lgfr %r4,%r4 # int
		llgtr %r5,%r5 # const char *
		jg sys_renameat

		ENTRY(sys_linkat_wrapper)
		lgfr %r2,%r2 # int
		llgtr %r3,%r3 # const char *
		lgfr %r4,%r4 # int
		llgtr %r5,%r5 # const char *
		lgfr %r6,%r6 # int
		jg sys_linkat

		ENTRY(sys_symlinkat_wrapper)
		llgtr %r2,%r2 # const char *
		lgfr %r3,%r3 # int
		llgtr %r4,%r4 # const char *
		jg sys_symlinkat

		ENTRY(sys_readlinkat_wrapper)
		lgfr %r2,%r2 # int
		llgtr %r3,%r3 # const char *
		llgtr %r4,%r4 # char *
		lgfr %r5,%r5 # int
		jg sys_readlinkat

		ENTRY(sys_fchmodat_wrapper)
		lgfr %r2,%r2 # int
		llgtr %r3,%r3 # const char *
		llgfr %r4,%r4 # mode_t
		jg sys_fchmodat

		ENTRY(sys_faccessat_wrapper)
		lgfr %r2,%r2 # int
		llgtr %r3,%r3 # const char *
		lgfr %r4,%r4 # int
		jg sys_faccessat

		ENTRY(compat_sys_pselect6_wrapper)
		lgfr %r2,%r2 # int
		llgtr %r3,%r3 # fd_set *
		@@ -363,20 +317,6 @@ ENTRY(compat_sys_ppoll_wrapper)
		llgfr %r6,%r6 # size_t
		jg compat_sys_ppoll

		ENTRY(sys_unshare_wrapper)
		llgfr %r2,%r2 # unsigned long
		jg sys_unshare

		ENTRY(sys_splice_wrapper)
		lgfr %r2,%r2 # int
		llgtr %r3,%r3 # loff_t *
		lgfr %r4,%r4 # int
		llgtr %r5,%r5 # loff_t *
		llgfr %r6,%r6 # size_t
		llgf %r0,164(%r15) # unsigned int
		stg %r0,160(%r15)
		jg sys_splice

		ENTRY(sys_sync_file_range_wrapper)
		lgfr %r2,%r2 # int
		sllg %r3,%r3,32 # get high word of 64bit loff_t
		@@ -386,13 +326,6 @@ ENTRY(sys_sync_file_range_wrapper)
		llgf %r5,164(%r15) # unsigned int
		jg sys_sync_file_range

		ENTRY(sys_tee_wrapper)
		lgfr %r2,%r2 # int
		lgfr %r3,%r3 # int
		llgfr %r4,%r4 # size_t
		llgfr %r5,%r5 # unsigned int
		jg sys_tee

		ENTRY(sys_getcpu_wrapper)
		llgtr %r2,%r2 # unsigned *
		llgtr %r3,%r3 # unsigned *

arch/s390/kernel/syscalls.S

+10 −10

Original line number	Diff line number	Diff line
		@@ -302,21 +302,21 @@ 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)
		SYSCALL(sys_renameat,sys_renameat,sys_renameat_wrapper) /* 295 */
		SYSCALL(sys_linkat,sys_linkat,sys_linkat_wrapper)
		SYSCALL(sys_symlinkat,sys_symlinkat,sys_symlinkat_wrapper)
		SYSCALL(sys_readlinkat,sys_readlinkat,sys_readlinkat_wrapper)
		SYSCALL(sys_fchmodat,sys_fchmodat,sys_fchmodat_wrapper)
		SYSCALL(sys_faccessat,sys_faccessat,sys_faccessat_wrapper) /* 300 */
		SYSCALL(sys_unlinkat,sys_unlinkat,compat_sys_unlinkat)
		SYSCALL(sys_renameat,sys_renameat,compat_sys_renameat) /* 295 */
		SYSCALL(sys_linkat,sys_linkat,compat_sys_linkat)
		SYSCALL(sys_symlinkat,sys_symlinkat,compat_sys_symlinkat)
		SYSCALL(sys_readlinkat,sys_readlinkat,compat_sys_readlinkat)
		SYSCALL(sys_fchmodat,sys_fchmodat,compat_sys_fchmodat)
		SYSCALL(sys_faccessat,sys_faccessat,compat_sys_faccessat) /* 300 */
		SYSCALL(sys_pselect6,sys_pselect6,compat_sys_pselect6_wrapper)
		SYSCALL(sys_ppoll,sys_ppoll,compat_sys_ppoll_wrapper)
		SYSCALL(sys_unshare,sys_unshare,sys_unshare_wrapper)
		SYSCALL(sys_unshare,sys_unshare,compat_sys_unshare)
		SYSCALL(sys_set_robust_list,sys_set_robust_list,compat_sys_set_robust_list)
		SYSCALL(sys_get_robust_list,sys_get_robust_list,compat_sys_get_robust_list)
		SYSCALL(sys_splice,sys_splice,sys_splice_wrapper)
		SYSCALL(sys_splice,sys_splice,compat_sys_splice)
		SYSCALL(sys_sync_file_range,sys_sync_file_range,sys_sync_file_range_wrapper)
		SYSCALL(sys_tee,sys_tee,sys_tee_wrapper)
		SYSCALL(sys_tee,sys_tee,compat_sys_tee)
		SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice)
		NI_SYSCALL /* 310 sys_move_pages */
		SYSCALL(sys_getcpu,sys_getcpu,sys_getcpu_wrapper)