---

yaml --- r: 170007 b: refs/heads/master c: 642c6d9 h: refs/heads/master i: 170005: 5c8d010 170003: a776fab 169999: 065ee7e v: v3
git-mirror · Nov 6, 2009 · 7d27e54 · 7d27e54
1 parent bbb996c
commit 7d27e54
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 942405f36038b8f930ab67e24aa1ad72bee96a25
+refs/heads/master: 642c6d946b5cdc27d0146c41dc20b7c4d4c3ccd8
diff --git a/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h
@@ -996,10 +996,6 @@ extern int proc_doulongvec_minmax(struct ctl_table *, int,
 extern int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int,
 				      void __user *, size_t *, loff_t *);
 
-extern int do_sysctl (int __user *name, int nlen,
-		      void __user *oldval, size_t __user *oldlenp,
-		      void __user *newval, size_t newlen);
-
 extern ctl_handler sysctl_data;
 extern ctl_handler sysctl_string;
 extern ctl_handler sysctl_intvec;

diff --git a/trunk/kernel/sysctl_binary.c b/trunk/kernel/sysctl_binary.c
@@ -135,7 +135,7 @@ static void deprecated_sysctl_warning(const int *name, int nlen)
 	return;
 }
 
-int do_sysctl(int __user *args_name, int nlen,
+static int do_sysctl(int __user *args_name, int nlen,
 	void __user *oldval, size_t __user *oldlenp,
 	void __user *newval, size_t newlen)
 {