s390/compat: convert to COMPAT_SYSCALL_DEFINEx part 6 (a0f8c6da) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/s390/kernel/compat_linux.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -388,7 +388,7 @@ COMPAT_SYSCALL_DEFINE2(s390_stat64, const char __user *, filename, struct stat64
		return ret;
		}

		asmlinkage long sys32_lstat64(const char __user * filename, struct stat64_emu31 __user * statbuf)
		COMPAT_SYSCALL_DEFINE2(s390_lstat64, const char __user , filename, struct stat64_emu31 __user , statbuf)
		{
		struct kstat stat;
		int ret = vfs_lstat(filename, &stat);
		@@ -397,7 +397,7 @@ asmlinkage long sys32_lstat64(const char __user * filename, struct stat64_emu31
		return ret;
		}

		asmlinkage long sys32_fstat64(unsigned long fd, struct stat64_emu31 __user * statbuf)
		COMPAT_SYSCALL_DEFINE2(s390_fstat64, unsigned int, fd, struct stat64_emu31 __user *, statbuf)
		{
		struct kstat stat;
		int ret = vfs_fstat(fd, &stat);
		@@ -406,8 +406,8 @@ asmlinkage long sys32_fstat64(unsigned long fd, struct stat64_emu31 __user * sta
		return ret;
		}

		asmlinkage long sys32_fstatat64(unsigned int dfd, const char __user *filename,
		struct stat64_emu31 __user* statbuf, int flag)
		COMPAT_SYSCALL_DEFINE4(s390_fstatat64, unsigned int, dfd, const char __user *, filename,
		struct stat64_emu31 __user *, statbuf, int, flag)
		{
		struct kstat stat;
		int error;
		@@ -433,7 +433,7 @@ struct mmap_arg_struct_emu31 {
		compat_ulong_t offset;
		};

		asmlinkage unsigned long old32_mmap(struct mmap_arg_struct_emu31 __user *arg)
		COMPAT_SYSCALL_DEFINE1(s390_old_mmap, struct mmap_arg_struct_emu31 __user *, arg)
		{
		struct mmap_arg_struct_emu31 a;

		@@ -445,7 +445,7 @@ asmlinkage unsigned long old32_mmap(struct mmap_arg_struct_emu31 __user *arg)
		a.offset >> PAGE_SHIFT);
		}

		asmlinkage long sys32_mmap2(struct mmap_arg_struct_emu31 __user *arg)
		COMPAT_SYSCALL_DEFINE1(s390_mmap2, struct mmap_arg_struct_emu31 __user *, arg)
		{
		struct mmap_arg_struct_emu31 a;

arch/s390/kernel/compat_linux.h

+5 −7

Original line number	Diff line number	Diff line
		@@ -104,13 +104,11 @@ long compat_sys_s390_pread64(unsigned int fd, char __user *ubuf, compat_size_t c
		long compat_sys_s390_pwrite64(unsigned int fd, const char __user *ubuf, compat_size_t count, u32 high, u32 low);
		long compat_sys_s390_readahead(int fd, u32 high, u32 low, s32 count);
		long compat_sys_s390_stat64(const char __user filename, struct stat64_emu31 __user statbuf);
		long sys32_lstat64(const char __user * filename,
		struct stat64_emu31 __user * statbuf);
		long sys32_fstat64(unsigned long fd, struct stat64_emu31 __user * statbuf);
		long sys32_fstatat64(unsigned int dfd, const char __user *filename,
		struct stat64_emu31 __user* statbuf, int flag);
		unsigned long old32_mmap(struct mmap_arg_struct_emu31 __user *arg);
		long sys32_mmap2(struct mmap_arg_struct_emu31 __user *arg);
		long compat_sys_s390_lstat64(const char __user filename, struct stat64_emu31 __user statbuf);
		long compat_sys_s390_fstat64(unsigned int fd, struct stat64_emu31 __user *statbuf);
		long compat_sys_s390_fstatat64(unsigned int dfd, const char __user filename, struct stat64_emu31 __user statbuf, int flag);
		long compat_sys_s390_old_mmap(struct mmap_arg_struct_emu31 __user *arg);
		long compat_sys_s390_mmap2(struct mmap_arg_struct_emu31 __user *arg);
		long sys32_read(unsigned int fd, char __user * buf, size_t count);
		long sys32_write(unsigned int fd, const char __user * buf, size_t count);
		long sys32_fadvise64(int fd, loff_t offset, size_t len, int advise);

arch/s390/kernel/compat_wrapper.S

+0 −25

Original line number	Diff line number	Diff line
		@@ -222,10 +222,6 @@ ENTRY(compat_sys_getrlimit_wrapper)
		llgtr %r3,%r3 # struct rlimit_emu31 *
		jg compat_sys_getrlimit # branch to system call

		ENTRY(sys32_mmap2_wrapper)
		llgtr %r2,%r2 # struct mmap_arg_struct_emu31 *
		jg sys32_mmap2 # branch to system call

		ENTRY(compat_sys_gettimeofday_wrapper)
		llgtr %r2,%r2 # struct timeval_emu31 *
		llgtr %r3,%r3 # struct timezone *
		@@ -269,10 +265,6 @@ ENTRY(old32_readdir_wrapper)
		llgfr %r4,%r4 # unsigned int
		jg compat_sys_old_readdir # branch to system call

		ENTRY(old32_mmap_wrapper)
		llgtr %r2,%r2 # struct mmap_arg_struct_emu31 *
		jg old32_mmap # branch to system call

		ENTRY(sys32_munmap_wrapper)
		llgfr %r2,%r2 # unsigned long
		llgfr %r3,%r3 # size_t
		@@ -665,20 +657,10 @@ ENTRY(compat_sys_fcntl64_wrapper)
		llgfr %r4,%r4 # unsigned long
		jg compat_sys_fcntl64 # branch to system call

		ENTRY(sys32_lstat64_wrapper)
		llgtr %r2,%r2 # char *
		llgtr %r3,%r3 # struct stat64 *
		jg sys32_lstat64 # branch to system call

		ENTRY(sys32_stime_wrapper)
		llgtr %r2,%r2 # long *
		jg compat_sys_stime # branch to system call

		ENTRY(sys32_fstat64_wrapper)
		llgfr %r2,%r2 # unsigned long
		llgtr %r3,%r3 # struct stat64 *
		jg sys32_fstat64 # branch to system call

		ENTRY(sys32_setxattr_wrapper)
		llgtr %r2,%r2 # char *
		llgtr %r3,%r3 # char *
		@@ -1013,13 +995,6 @@ ENTRY(compat_sys_futimesat_wrapper)
		llgtr %r4,%r4 # struct timeval *
		jg compat_sys_futimesat

		ENTRY(sys32_fstatat64_wrapper)
		llgfr %r2,%r2 # unsigned int
		llgtr %r3,%r3 # char *
		llgtr %r4,%r4 # struct stat64 *
		lgfr %r5,%r5 # int
		jg sys32_fstatat64

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

arch/s390/kernel/syscalls.S

+5 −5

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ SYSCALL(sys_uselib,sys_uselib,sys32_uselib_wrapper)
		SYSCALL(sys_swapon,sys_swapon,sys32_swapon_wrapper)
		SYSCALL(sys_reboot,sys_reboot,sys32_reboot_wrapper)
		SYSCALL(sys_ni_syscall,sys_ni_syscall,old32_readdir_wrapper) /* old readdir syscall */
		SYSCALL(sys_old_mmap,sys_old_mmap,old32_mmap_wrapper) /* 90 */
		SYSCALL(sys_old_mmap,sys_old_mmap,compat_sys_s390_old_mmap) /* 90 */
		SYSCALL(sys_munmap,sys_munmap,sys32_munmap_wrapper)
		SYSCALL(sys_truncate,sys_truncate,compat_sys_truncate)
		SYSCALL(sys_ftruncate,sys_ftruncate,compat_sys_ftruncate)
		@@ -200,12 +200,12 @@ NI_SYSCALL /* streams1 */
		NI_SYSCALL /* streams2 */
		SYSCALL(sys_vfork,sys_vfork,sys_vfork) /* 190 */
		SYSCALL(sys_getrlimit,sys_getrlimit,compat_sys_getrlimit_wrapper)
		SYSCALL(sys_mmap2,sys_mmap2,sys32_mmap2_wrapper)
		SYSCALL(sys_mmap2,sys_mmap2,compat_sys_s390_mmap2)
		SYSCALL(sys_truncate64,sys_ni_syscall,compat_sys_s390_truncate64)
		SYSCALL(sys_ftruncate64,sys_ni_syscall,compat_sys_s390_ftruncate64)
		SYSCALL(sys_stat64,sys_ni_syscall,compat_sys_s390_stat64) /* 195 */
		SYSCALL(sys_lstat64,sys_ni_syscall,sys32_lstat64_wrapper)
		SYSCALL(sys_fstat64,sys_ni_syscall,sys32_fstat64_wrapper)
		SYSCALL(sys_lstat64,sys_ni_syscall,compat_sys_s390_lstat64)
		SYSCALL(sys_fstat64,sys_ni_syscall,compat_sys_s390_fstat64)
		SYSCALL(sys_lchown,sys_lchown,sys32_lchown_wrapper)
		SYSCALL(sys_getuid,sys_getuid,sys_getuid)
		SYSCALL(sys_getgid,sys_getgid,sys_getgid) /* 200 */
		@@ -301,7 +301,7 @@ 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_futimesat,sys_futimesat,compat_sys_futimesat_wrapper)
		SYSCALL(sys_fstatat64,sys_newfstatat,sys32_fstatat64_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)