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

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

switch compat_sys_sysctl to COMPAT_SYSCALL_DEFINE 



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

arch/s390/kernel/compat_wrapper.S

+0 −4
Original line number Diff line number Diff line
@@ -793,10 +793,6 @@ ENTRY(sys32_stime_wrapper) 
	llgtr	%r2,%r2			# long *

	jg	compat_sys_stime	# branch to system call



ENTRY(sys32_sysctl_wrapper)

	llgtr	%r2,%r2 		# struct compat_sysctl_args *

	jg	compat_sys_sysctl



ENTRY(sys32_fstat64_wrapper)

	llgfr	%r2,%r2			# unsigned long

	llgtr	%r3,%r3			# struct stat64 *

arch/s390/kernel/syscalls.S

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ SYSCALL(sys_readv,sys_readv,compat_sys_readv_wrapper) /* 145 */ 
SYSCALL(sys_writev,sys_writev,compat_sys_writev_wrapper)

SYSCALL(sys_getsid,sys_getsid,sys32_getsid_wrapper)

SYSCALL(sys_fdatasync,sys_fdatasync,sys32_fdatasync_wrapper)

SYSCALL(sys_sysctl,sys_sysctl,sys32_sysctl_wrapper)

SYSCALL(sys_sysctl,sys_sysctl,compat_sys_sysctl)

SYSCALL(sys_mlock,sys_mlock,sys32_mlock_wrapper)		/* 150 */

SYSCALL(sys_munlock,sys_munlock,sys32_munlock_wrapper)

SYSCALL(sys_mlockall,sys_mlockall,sys32_mlockall_wrapper)

kernel/sysctl_binary.c

+2 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/netdevice.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/compat.h>



#ifdef CONFIG_SYSCTL_SYSCALL
@@ -1447,7 +1448,6 @@ SYSCALL_DEFINE1(sysctl, struct __sysctl_args __user *, args) 




#ifdef CONFIG_COMPAT

#include <asm/compat.h>



struct compat_sysctl_args {

	compat_uptr_t	name;
@@ -1459,7 +1459,7 @@ struct compat_sysctl_args { 
	compat_ulong_t	__unused[4];

};



asmlinkage long compat_sys_sysctl(struct compat_sysctl_args __user *args)

COMPAT_SYSCALL_DEFINE1(sysctl, struct compat_sysctl_args __user *, args)

{

	struct compat_sysctl_args tmp;

	compat_size_t __user *compat_oldlenp;