From 7d27e5459cb0ed43a556998bf4cdb3fda0b05183 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Fri, 3 Apr 2009 01:08:48 -0700
Subject: [PATCH] --- yaml --- r: 170007 b: refs/heads/master c:
 642c6d946b5cdc27d0146c41dc20b7c4d4c3ccd8 h: refs/heads/master i:   170005:
 5c8d010b39808e8e255539267f5be8e108d7cead   170003:
 a776fab338c77d0bae8892971d5cbb5301ad0691   169999:
 065ee7e9f1ef8368f533c160c016b9ed851f7f80 v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/sysctl.h | 4 ----
 trunk/kernel/sysctl_binary.c | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e0521d1bd71f..0c8861265d66 100644
--- 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
index 1e4743ee6831..82c32b89932d 100644
--- 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
index 775cc49da622..642019894299 100644
--- 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)
 {