On Thu, Jan 04, 2007 at 10:02:00PM -0800, Andrew Morton wrote: >... > Changes since 2.6.20-rc2-mm1: >... > +add-taint_user-and-ability-to-set-taint-flags-from-userspace.patch >... > Misc fixes and updates >...
This patch makes the needlessly global proc_dointvec_taint() static. Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]> --- include/linux/sysctl.h | 2 -- kernel/sysctl.c | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) --- linux-2.6.20-rc3-mm1/include/linux/sysctl.h.old 2007-01-05 23:28:46.000000000 +0100 +++ linux-2.6.20-rc3-mm1/include/linux/sysctl.h 2007-01-05 23:28:54.000000000 +0100 @@ -929,8 +929,6 @@ void __user *, size_t *, loff_t *); extern int proc_dointvec_bset(ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); -extern int proc_dointvec_taint(ctl_table *, int, struct file *, - void __user *, size_t *, loff_t *); extern int proc_dointvec_minmax(ctl_table *, int, struct file *, void __user *, size_t *, loff_t *); extern int proc_dointvec_jiffies(ctl_table *, int, struct file *, --- linux-2.6.20-rc3-mm1/kernel/sysctl.c.old 2007-01-05 23:29:05.000000000 +0100 +++ linux-2.6.20-rc3-mm1/kernel/sysctl.c 2007-01-05 23:30:31.000000000 +0100 @@ -181,6 +181,9 @@ int sysctl_legacy_va_layout; #endif +static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp, + void __user *buffer, size_t *lenp, loff_t *ppos); + static void *get_uts(ctl_table *table, int write) { char *which = table->data; @@ -2022,8 +2025,8 @@ /* * Taint values can only be increased */ -int proc_dointvec_taint(ctl_table *table, int write, struct file *filp, - void __user *buffer, size_t *lenp, loff_t *ppos) +static int proc_dointvec_taint(ctl_table *table, int write, struct file *filp, + void __user *buffer, size_t *lenp, loff_t *ppos) { int op; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/