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

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

x86: switch to generic compat sched_rr_get_interval() 



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

arch/x86/ia32/sys_ia32.c

+0 −17
Original line number Diff line number Diff line
@@ -293,23 +293,6 @@ asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr, 
	return compat_sys_wait4(pid, stat_addr, options, NULL);

}



/* 32-bit timeval and related flotsam.  */



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 __user *)&t);

	set_fs(old_fs);

	if (put_compat_timespec(&t, interval))

		return -EFAULT;

	return ret;

}



/* warning: next two assume little endian */

asmlinkage long sys32_pread(unsigned int fd, char __user *ubuf, u32 count,

			    u32 poslo, u32 poshi)

arch/x86/include/asm/sys_ia32.h

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ asmlinkage long sys32_alarm(unsigned int); 
asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);

asmlinkage long sys32_sysfs(int, u32, u32);



asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,

					    struct compat_timespec __user *);



asmlinkage long sys32_pread(unsigned int, char __user *, u32, u32, u32);

asmlinkage long sys32_pwrite(unsigned int, const char __user *, u32, u32, u32);

arch/x86/syscalls/syscall_32.tbl

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
158	i386	sched_yield		sys_sched_yield

159	i386	sched_get_priority_max	sys_sched_get_priority_max

160	i386	sched_get_priority_min	sys_sched_get_priority_min

161	i386	sched_rr_get_interval	sys_sched_rr_get_interval	sys32_sched_rr_get_interval

161	i386	sched_rr_get_interval	sys_sched_rr_get_interval	compat_sys_sched_rr_get_interval

162	i386	nanosleep		sys_nanosleep			compat_sys_nanosleep

163	i386	mremap			sys_mremap

164	i386	setresuid		sys_setresuid16