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

Commit b89a8171 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Linus Torvalds
Browse files

[PATCH] sysctl: Allow /proc/sys without sys_sysctl 



Since sys_sysctl is deprecated start allow it to be compiled out.  This
should catch any remaining user space code that cares, and paves the way
for further sysctl cleanups.

[akpm@osdl.org: If sys_sysctl() is not compiled-in, emit a warning]
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 57181784

arch/ia64/ia32/sys_ia32.c

+1 −1
Original line number Diff line number Diff line
@@ -1942,7 +1942,7 @@ struct sysctl32 { 
	unsigned int	__unused[4];

};



#ifdef CONFIG_SYSCTL

#ifdef CONFIG_SYSCTL_SYSCALL

asmlinkage long

sys32_sysctl (struct sysctl32 __user *args)

{

arch/mips/kernel/linux32.c

+2 −2
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ struct sysctl_args32 
	unsigned int __unused[4];

};



#ifdef CONFIG_SYSCTL

#ifdef CONFIG_SYSCTL_SYSCALL



asmlinkage long sys32_sysctl(struct sysctl_args32 __user *args)

{
@@ -1032,7 +1032,7 @@ asmlinkage long sys32_sysctl(struct sysctl_args32 __user *args) 
	return error;

}



#endif /* CONFIG_SYSCTL */

#endif /* CONFIG_SYSCTL_SYSCALL */



asmlinkage long sys32_newuname(struct new_utsname __user * name)

{

arch/powerpc/kernel/sys_ppc32.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ asmlinkage long compat_sys_umask(u32 mask) 
	return sys_umask((int)mask);

}



#ifdef CONFIG_SYSCTL

#ifdef CONFIG_SYSCTL_SYSCALL

struct __sysctl_args32 {

	u32 name;

	int nlen;

arch/s390/kernel/compat_linux.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ asmlinkage long sys32_sendfile64(int out_fd, int in_fd, 
	return ret;

}



#ifdef CONFIG_SYSCTL

#ifdef CONFIG_SYSCTL_SYSCALL

struct __sysctl_args32 {

	u32 name;

	int nlen;

arch/sparc64/kernel/sys_sparc32.c

+1 −1
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ struct __sysctl_args32 { 


asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args)

{

#ifndef CONFIG_SYSCTL

#ifndef CONFIG_SYSCTL_SYSCALL

	return -ENOSYS;

#else

	struct __sysctl_args32 tmp;