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

Commit 8d2d5c4a authored by Al Viro's avatar Al Viro
Browse files

switch getrusage() to COMPAT_SYSCALL_DEFINE 



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

arch/s390/kernel/compat_wrapper.S

+0 −5
Original line number Diff line number Diff line
@@ -258,11 +258,6 @@ ENTRY(sys32_mmap2_wrapper) 
	llgtr	%r2,%r2			# struct mmap_arg_struct_emu31 *

	jg	sys32_mmap2			# branch to system call



ENTRY(compat_sys_getrusage_wrapper)

	lgfr	%r2,%r2			# int

	llgtr	%r3,%r3			# struct rusage_emu31 *

	jg	compat_sys_getrusage	# branch to system call



ENTRY(compat_sys_gettimeofday_wrapper)

	llgtr	%r2,%r2			# struct timeval_emu31 *

	llgtr	%r3,%r3			# struct timezone *

arch/s390/kernel/syscalls.S

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ SYSCALL(sys_sigpending,sys_sigpending,compat_sys_sigpending_wrapper) 
SYSCALL(sys_sethostname,sys_sethostname,sys32_sethostname_wrapper)

SYSCALL(sys_setrlimit,sys_setrlimit,compat_sys_setrlimit_wrapper)	/* 75 */

SYSCALL(sys_old_getrlimit,sys_getrlimit,compat_sys_old_getrlimit_wrapper)

SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage_wrapper)

SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage)

SYSCALL(sys_gettimeofday,sys_gettimeofday,compat_sys_gettimeofday_wrapper)

SYSCALL(sys_settimeofday,sys_settimeofday,compat_sys_settimeofday_wrapper)

SYSCALL(sys_getgroups16,sys_ni_syscall,sys32_getgroups16_wrapper)	/* 80 old getgroups16 syscall */

arch/sparc/kernel/sys32.S

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ STUB: sra REG1, 0, REG1; \ 
	jmpl	%g1 + %lo(SYSCALL), %g0; \

	sra	REG3, 0, REG3



SIGN1(sys32_getrusage, compat_sys_getrusage, %o0)

SIGN1(sys32_readahead, compat_sys_readahead, %o0)

SIGN2(sys32_fadvise64, compat_sys_fadvise64, %o0, %o4)

SIGN2(sys32_fadvise64_64, compat_sys_fadvise64_64, %o0, %o5)

arch/sparc/kernel/systbls_64.S

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ sys_call_table32: 
/*100*/ .word sys_getpriority, sys32_rt_sigreturn, compat_sys_rt_sigaction, compat_sys_rt_sigprocmask, compat_sys_rt_sigpending

	.word compat_sys_rt_sigtimedwait, compat_sys_rt_sigqueueinfo, compat_sys_rt_sigsuspend, sys_setresuid, sys_getresuid

/*110*/	.word sys_setresgid, sys_getresgid, sys_setregid, sys_nis_syscall, sys_nis_syscall

	.word sys_getgroups, compat_sys_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd

	.word sys_getgroups, compat_sys_gettimeofday, compat_sys_getrusage, sys_nis_syscall, sys_getcwd

/*120*/	.word compat_sys_readv, compat_sys_writev, compat_sys_settimeofday, sys_fchown16, sys_fchmod

	.word sys_nis_syscall, sys_setreuid16, sys_setregid16, sys_rename, compat_sys_truncate

/*130*/	.word compat_sys_ftruncate, sys_flock, compat_sys_lstat64, sys_nis_syscall, sys_nis_syscall

kernel/compat.c

+0 −19
Original line number Diff line number Diff line
@@ -516,25 +516,6 @@ int put_compat_rusage(const struct rusage *r, struct compat_rusage __user *ru) 
	return 0;

}



asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)

{

	struct rusage r;

	int ret;

	mm_segment_t old_fs = get_fs();



	set_fs(KERNEL_DS);

	ret = sys_getrusage(who, (struct rusage __user *) &r);

	set_fs(old_fs);



	if (ret)

		return ret;



	if (put_compat_rusage(&r, ru))

		return -EFAULT;



	return 0;

}



COMPAT_SYSCALL_DEFINE4(wait4,

	compat_pid_t, pid,

	compat_uint_t __user *, stat_addr,