s390/compat: convert system call wrappers to C part 14 (7f6afe87) · Commits · e / devices / android_kernel_samsung_universal8895

arch/s390/kernel/compat_wrap.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -154,3 +154,13 @@ COMPAT_SYSCALL_WRAP3(faccessat, int, dfd, const char __user *, filename, int, mo
		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);
		COMPAT_SYSCALL_WRAP3(getcpu, unsigned __user , cpu, unsigned __user , node, struct getcpu_cache __user *, cache);
		COMPAT_SYSCALL_WRAP1(eventfd, unsigned int, count);
		COMPAT_SYSCALL_WRAP2(timerfd_create, int, clockid, int, flags);
		COMPAT_SYSCALL_WRAP2(eventfd2, unsigned int, count, int, flags);
		COMPAT_SYSCALL_WRAP1(inotify_init1, int, flags);
		COMPAT_SYSCALL_WRAP2(pipe2, int __user *, fildes, int, flags);
		COMPAT_SYSCALL_WRAP3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags);
		COMPAT_SYSCALL_WRAP1(epoll_create1, int, flags);
		COMPAT_SYSCALL_WRAP2(tkill, int, pid, int, sig);
		COMPAT_SYSCALL_WRAP3(tgkill, int, tgid, int, pid, int, sig);

arch/s390/kernel/compat_wrapper.S

+0 −50

Original line number	Diff line number	Diff line
		@@ -326,12 +326,6 @@ ENTRY(sys_sync_file_range_wrapper)
		llgf %r5,164(%r15) # unsigned int
		jg sys_sync_file_range

		ENTRY(sys_getcpu_wrapper)
		llgtr %r2,%r2 # unsigned *
		llgtr %r3,%r3 # unsigned *
		llgtr %r4,%r4 # struct getcpu_cache *
		jg sys_getcpu

		ENTRY(compat_sys_utimes_wrapper)
		llgtr %r2,%r2 # char *
		llgtr %r3,%r3 # struct compat_timeval *
		@@ -344,10 +338,6 @@ ENTRY(compat_sys_utimensat_wrapper)
		lgfr %r5,%r5 # int
		jg compat_sys_utimensat

		ENTRY(sys_eventfd_wrapper)
		llgfr %r2,%r2 # unsigned int
		jg sys_eventfd

		ENTRY(sys_fallocate_wrapper)
		lgfr %r2,%r2 # int
		lgfr %r3,%r3 # int
		@@ -357,46 +347,6 @@ ENTRY(sys_fallocate_wrapper)
		l %r5,164(%r15) # get low word of 64bit loff_t
		jg sys_fallocate

		ENTRY(sys_timerfd_create_wrapper)
		lgfr %r2,%r2 # int
		lgfr %r3,%r3 # int
		jg sys_timerfd_create

		ENTRY(sys_eventfd2_wrapper)
		llgfr %r2,%r2 # unsigned int
		lgfr %r3,%r3 # int
		jg sys_eventfd2

		ENTRY(sys_inotify_init1_wrapper)
		lgfr %r2,%r2 # int
		jg sys_inotify_init1

		ENTRY(sys_pipe2_wrapper)
		llgtr %r2,%r2 # u32 *
		lgfr %r3,%r3 # int
		jg sys_pipe2 # branch to system call

		ENTRY(sys_dup3_wrapper)
		llgfr %r2,%r2 # unsigned int
		llgfr %r3,%r3 # unsigned int
		lgfr %r4,%r4 # int
		jg sys_dup3 # branch to system call

		ENTRY(sys_epoll_create1_wrapper)
		lgfr %r2,%r2 # int
		jg sys_epoll_create1 # branch to system call

		ENTRY(sys_tkill_wrapper)
		lgfr %r2,%r2 # pid_t
		lgfr %r3,%r3 # int
		jg sys_tkill # branch to system call

		ENTRY(sys_tgkill_wrapper)
		lgfr %r2,%r2 # pid_t
		lgfr %r3,%r3 # pid_t
		lgfr %r4,%r4 # int
		jg sys_tgkill # branch to system call

		ENTRY(compat_sys_keyctl_wrapper)
		llgfr %r2,%r2 # u32
		llgfr %r3,%r3 # u32

arch/s390/kernel/syscalls.S

+10 −10

Original line number	Diff line number	Diff line
		@@ -245,11 +245,11 @@ 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_tkill,sys_tkill,compat_sys_tkill)
		SYSCALL(sys_futex,sys_futex,compat_sys_futex)
		SYSCALL(sys_sched_setaffinity,sys_sched_setaffinity,sys32_sched_setaffinity_wrapper)
		SYSCALL(sys_sched_getaffinity,sys_sched_getaffinity,sys32_sched_getaffinity_wrapper) /* 240 */
		SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill_wrapper)
		SYSCALL(sys_tgkill,sys_tgkill,compat_sys_tgkill)
		NI_SYSCALL /* reserved for TUX */
		SYSCALL(sys_io_setup,sys_io_setup,sys32_io_setup_wrapper)
		SYSCALL(sys_io_destroy,sys_io_destroy,compat_sys_io_destroy)
		@@ -319,23 +319,23 @@ SYSCALL(sys_sync_file_range,sys_sync_file_range,sys_sync_file_range_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)
		SYSCALL(sys_getcpu,sys_getcpu,compat_sys_getcpu)
		SYSCALL(sys_epoll_pwait,sys_epoll_pwait,compat_sys_epoll_pwait)
		SYSCALL(sys_utimes,sys_utimes,compat_sys_utimes_wrapper)
		SYSCALL(sys_s390_fallocate,sys_fallocate,sys_fallocate_wrapper)
		SYSCALL(sys_utimensat,sys_utimensat,compat_sys_utimensat_wrapper) /* 315 */
		SYSCALL(sys_signalfd,sys_signalfd,compat_sys_signalfd)
		NI_SYSCALL /* 317 old sys_timer_fd */
		SYSCALL(sys_eventfd,sys_eventfd,sys_eventfd_wrapper)
		SYSCALL(sys_timerfd_create,sys_timerfd_create,sys_timerfd_create_wrapper)
		SYSCALL(sys_eventfd,sys_eventfd,compat_sys_eventfd)
		SYSCALL(sys_timerfd_create,sys_timerfd_create,compat_sys_timerfd_create)
		SYSCALL(sys_timerfd_settime,sys_timerfd_settime,compat_sys_timerfd_settime) /* 320 */
		SYSCALL(sys_timerfd_gettime,sys_timerfd_gettime,compat_sys_timerfd_gettime)
		SYSCALL(sys_signalfd4,sys_signalfd4,compat_sys_signalfd4)
		SYSCALL(sys_eventfd2,sys_eventfd2,sys_eventfd2_wrapper)
		SYSCALL(sys_inotify_init1,sys_inotify_init1,sys_inotify_init1_wrapper)
		SYSCALL(sys_pipe2,sys_pipe2,sys_pipe2_wrapper) /* 325 */
		SYSCALL(sys_dup3,sys_dup3,sys_dup3_wrapper)
		SYSCALL(sys_epoll_create1,sys_epoll_create1,sys_epoll_create1_wrapper)
		SYSCALL(sys_eventfd2,sys_eventfd2,compat_sys_eventfd2)
		SYSCALL(sys_inotify_init1,sys_inotify_init1,compat_sys_inotify_init1)
		SYSCALL(sys_pipe2,sys_pipe2,compat_sys_pipe2) /* 325 */
		SYSCALL(sys_dup3,sys_dup3,compat_sys_dup3)
		SYSCALL(sys_epoll_create1,sys_epoll_create1,compat_sys_epoll_create1)
		SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv)
		SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev)
		SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo) /* 330 */