Commit d7b5427c authored by Al Viro's avatar Al Viro
Browse files

s390: switch to generic compat sched_rr_get_interval() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e181ee4c

arch/s390/kernel/compat_linux.c

+0 −16
Original line number Diff line number Diff line
@@ -352,22 +352,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned 
		return sys_ftruncate(fd, (high << 32) | low);

}



asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,

				struct compat_timespec __user *interval)

{

	struct timespec t;

	int ret;

	mm_segment_t old_fs = get_fs ();

	

	set_fs (KERNEL_DS);

	ret = sys_sched_rr_get_interval(pid,

					(struct timespec __force __user *) &t);

	set_fs (old_fs);

	if (put_compat_timespec(&t, interval))

		return -EFAULT;

	return ret;

}



asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf,

				size_t count, u32 poshi, u32 poslo)

{

arch/s390/kernel/compat_linux.h

+0 −2
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ long sys32_ipc(u32 call, int first, int second, int third, u32 ptr); 
long sys32_truncate64(const char __user * path, unsigned long high,

		      unsigned long low);

long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned long low);

long sys32_sched_rr_get_interval(compat_pid_t pid,

				 struct compat_timespec __user *interval);

long sys32_init_module(void __user *umod, unsigned long len,

		       const char __user *uargs);

long sys32_delete_module(const char __user *name_user, unsigned int flags);

arch/s390/kernel/compat_wrapper.S

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ ENTRY(sys32_sched_get_priority_min_wrapper) 
ENTRY(sys32_sched_rr_get_interval_wrapper)

	lgfr	%r2,%r2			# pid_t

	llgtr	%r3,%r3			# struct compat_timespec *

	jg	sys32_sched_rr_get_interval	# branch to system call

	jg	compat_sys_sched_rr_get_interval	# branch to system call



ENTRY(compat_sys_nanosleep_wrapper)

	llgtr	%r2,%r2			# struct compat_timespec *