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

Commit 1f29bcd7 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] sysctl: remove unused "context" param 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: David Howells <dhowells@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 98d7340c

arch/frv/kernel/pm.c

+3 −3
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int cmode_procctl(ctl_table *ctl, int write, struct file *filp, 


static int cmode_sysctl(ctl_table *table, int __user *name, int nlen,

			void __user *oldval, size_t __user *oldlenp,

			void __user *newval, size_t newlen, void **context)

			void __user *newval, size_t newlen)

{

	if (oldval && oldlenp) {

		size_t oldlen;
@@ -326,7 +326,7 @@ static int p0_procctl(ctl_table *ctl, int write, struct file *filp, 


static int p0_sysctl(ctl_table *table, int __user *name, int nlen,

		     void __user *oldval, size_t __user *oldlenp,

		     void __user *newval, size_t newlen, void **context)

		     void __user *newval, size_t newlen)

{

	if (oldval && oldlenp) {

		size_t oldlen;
@@ -370,7 +370,7 @@ static int cm_procctl(ctl_table *ctl, int write, struct file *filp, 


static int cm_sysctl(ctl_table *table, int __user *name, int nlen,

		     void __user *oldval, size_t __user *oldlenp,

		     void __user *newval, size_t newlen, void **context)

		     void __user *newval, size_t newlen)

{

	if (oldval && oldlenp) {

		size_t oldlen;

arch/mips/lasat/sysctl.c

+8 −9
Original line number Diff line number Diff line
@@ -40,12 +40,12 @@ static DEFINE_MUTEX(lasat_info_mutex); 
/* Strategy function to write EEPROM after changing string entry */

int sysctl_lasatstring(ctl_table *table, int *name, int nlen,

		void *oldval, size_t *oldlenp,

		void *newval, size_t newlen, void **context)

		void *newval, size_t newlen)

{

	int r;

	mutex_lock(&lasat_info_mutex);

	r = sysctl_string(table, name,

			  nlen, oldval, oldlenp, newval, newlen, context);

			  nlen, oldval, oldlenp, newval, newlen);

	if (r < 0) {

		mutex_unlock(&lasat_info_mutex);

		return r;
@@ -119,11 +119,11 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, 
/* Sysctl for setting the IP addresses */

int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,

		    void *oldval, size_t *oldlenp,

		    void *newval, size_t newlen, void **context)

		    void *newval, size_t newlen)

{

	int r;

	mutex_lock(&lasat_info_mutex);

	r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);

	r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);

	if (r < 0) {

		mutex_unlock(&lasat_info_mutex);

		return r;
@@ -139,14 +139,14 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen, 
/* Same for RTC */

int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,

		    void *oldval, size_t *oldlenp,

		    void *newval, size_t newlen, void **context)

		    void *newval, size_t newlen)

{

	int r;

	mutex_lock(&lasat_info_mutex);

	rtctmp = ds1603_read();

	if (rtctmp < 0)

		rtctmp = 0;

	r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);

	r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);

	if (r < 0) {

		mutex_unlock(&lasat_info_mutex);

		return r;
@@ -251,13 +251,12 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, 


static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,

				     void *oldval, size_t *oldlenp,

				     void *newval, size_t newlen,

				     void **context)

				     void *newval, size_t newlen)

{

	int r;



	mutex_lock(&lasat_info_mutex);

	r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);

	r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);

	if (r < 0) {

		mutex_unlock(&lasat_info_mutex);

		return r;

arch/x86_64/kernel/vsyscall.c

+1 −2
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ out: 


static int vsyscall_sysctl_nostrat(ctl_table *t, int __user *name, int nlen,

				void __user *oldval, size_t __user *oldlenp,

				void __user *newval, size_t newlen,

				void **context)

				void __user *newval, size_t newlen)

{

	return -ENOSYS;

}

drivers/char/random.c

+1 −1
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ static int proc_do_uuid(ctl_table *table, int write, struct file *filp, 


static int uuid_strategy(ctl_table *table, int __user *name, int nlen,

			 void __user *oldval, size_t __user *oldlenp,

			 void __user *newval, size_t newlen, void **context)

			 void __user *newval, size_t newlen)

{

	unsigned char tmp_uuid[16], *uuid;

	unsigned int len;

include/linux/sysctl.h

+2 −3
Original line number Diff line number Diff line
@@ -918,8 +918,7 @@ typedef struct ctl_table ctl_table; 


typedef int ctl_handler (ctl_table *table, int __user *name, int nlen,

			 void __user *oldval, size_t __user *oldlenp,

			 void __user *newval, size_t newlen, 

			 void **context);

			 void __user *newval, size_t newlen);



typedef int proc_handler (ctl_table *ctl, int write, struct file * filp,

			  void __user *buffer, size_t *lenp, loff_t *ppos);
@@ -950,7 +949,7 @@ extern int do_sysctl (int __user *name, int nlen, 
extern int do_sysctl_strategy (ctl_table *table, 

			       int __user *name, int nlen,

			       void __user *oldval, size_t __user *oldlenp,

			       void __user *newval, size_t newlen, void ** context);

			       void __user *newval, size_t newlen);



extern ctl_handler sysctl_string;

extern ctl_handler sysctl_intvec;