1 files changed, 33 insertions, 35 deletions

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 025fcb3c66f8..130c5ec9ee0b 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -133,7 +133,7 @@ extern int max_lock_depth;
 
 #ifdef CONFIG_SYSCTL_SYSCALL
 static int parse_table(int __user *, int, void __user *, size_t __user *,
-                void __user *, size_t, ctl_table *, void **);
+                void __user *, size_t, ctl_table *);
 #endif
 
 static int proc_do_uts_string(ctl_table *table, int write, struct file *filp,
@@ -141,12 +141,12 @@ static int proc_do_uts_string(ctl_table *table, int write, struct file *filp,
 
 static int sysctl_uts_string(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);
 
 #ifdef CONFIG_SYSVIPC
 static int sysctl_ipc_data(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);
 #endif
 
 #ifdef CONFIG_PROC_SYSCTL
@@ -1243,7 +1243,6 @@ int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *ol
         do {
                 struct ctl_table_header *head =
                         list_entry(tmp, struct ctl_table_header, ctl_entry);
-                void *context = NULL;
 
                 if (!use_table(head))
                         continue;
@@ -1251,9 +1250,7 @@ int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *ol
                 spin_unlock(&sysctl_lock);
 
                 error = parse_table(name, nlen, oldval, oldlenp, 
-                                        newval, newlen, head->ctl_table,
-                                        &context);
-                kfree(context);
+                                        newval, newlen, head->ctl_table);
 
                 spin_lock(&sysctl_lock);
                 unuse_table(head);
@@ -1309,7 +1306,7 @@ static inline int ctl_perm(ctl_table *table, int op)
 static int parse_table(int __user *name, int nlen,
                        void __user *oldval, size_t __user *oldlenp,
                        void __user *newval, size_t newlen,
-                       ctl_table *table, void **context)
+                       ctl_table *table)
 {
         int n;
 repeat:
@@ -1329,7 +1326,7 @@ repeat:
                                         error = table->strategy(
                                                 table, name, nlen,
                                                 oldval, oldlenp,
-                                                newval, newlen, context);
+                                                newval, newlen);
                                         if (error)
                                                 return error;
                                 }
@@ -1340,7 +1337,7 @@ repeat:
                         }
                         error = do_sysctl_strategy(table, name, nlen,
                                                    oldval, oldlenp,
-                                                   newval, newlen, context);
+                                                   newval, newlen);
                         return error;
                 }
         }
@@ -1351,7 +1348,7 @@ repeat:
 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)
 {
         int op = 0, rc;
         size_t len;
@@ -1365,7 +1362,7 @@ int do_sysctl_strategy (ctl_table *table,
 
         if (table->strategy) {
                 rc = table->strategy(table, name, nlen, oldval, oldlenp,
-                                     newval, newlen, context);
+                                     newval, newlen);
                 if (rc < 0)
                         return rc;
                 if (rc > 0)
@@ -1931,9 +1928,6 @@ int proc_dointvec(ctl_table *table, int write, struct file *filp,
 
 #define OP_SET  0
 #define OP_AND  1
-#define OP_OR   2
-#define OP_MAX  3
-#define OP_MIN  4
 
 static int do_proc_dointvec_bset_conv(int *negp, unsigned long *lvalp,
                                       int *valp,
@@ -1945,13 +1939,6 @@ static int do_proc_dointvec_bset_conv(int *negp, unsigned long *lvalp,
                 switch(op) {
                 case OP_SET:    *valp = val; break;
                 case OP_AND:    *valp &= val; break;
-                case OP_OR:     *valp |= val; break;
-                case OP_MAX:    if(*valp < val)
-                                        *valp = val;
-                                break;
-                case OP_MIN:    if(*valp > val)
-                                *valp = val;
-                                break;
                 }
         } else {
                 int val = *valp;
@@ -2408,6 +2395,17 @@ static int proc_do_ipc_string(ctl_table *table, int write, struct file *filp,
 {
         return -ENOSYS;
 }
+static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp,
+                void __user *buffer, size_t *lenp, loff_t *ppos)
+{
+        return -ENOSYS;
+}
+static int proc_ipc_doulongvec_minmax(ctl_table *table, int write,
+                struct file *filp, void __user *buffer,
+                size_t *lenp, loff_t *ppos)
+{
+        return -ENOSYS;
+}
 #endif
 
 int proc_dointvec(ctl_table *table, int write, struct file *filp,
@@ -2472,7 +2470,7 @@ int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int write,
 /* The generic string strategy routine: */
 int sysctl_string(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 (!table->data || !table->maxlen) 
                 return -ENOTDIR;
@@ -2518,7 +2516,7 @@ int sysctl_string(ctl_table *table, int __user *name, int nlen,
  */
 int sysctl_intvec(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 (newval && newlen) {
@@ -2554,7 +2552,7 @@ int sysctl_intvec(ctl_table *table, int __user *name, int nlen,
 /* Strategy function to convert jiffies to seconds */ 
 int sysctl_jiffies(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) {
                 size_t olen;
@@ -2582,7 +2580,7 @@ int sysctl_jiffies(ctl_table *table, int __user *name, int nlen,
 /* Strategy function to convert jiffies to seconds */ 
 int sysctl_ms_jiffies(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) {
                 size_t olen;
@@ -2611,7 +2609,7 @@ int sysctl_ms_jiffies(ctl_table *table, int __user *name, int nlen,
 /* The generic string strategy routine: */
 static int sysctl_uts_string(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)
 {
         struct ctl_table uts_table;
         int r, write;
@@ -2619,7 +2617,7 @@ static int sysctl_uts_string(ctl_table *table, int __user *name, int nlen,
         memcpy(&uts_table, table, sizeof(uts_table));
         uts_table.data = get_uts(table, write);
         r = sysctl_string(&uts_table, name, nlen,
-                oldval, oldlenp, newval, newlen, context);
+                oldval, oldlenp, newval, newlen);
         put_uts(table, write, uts_table.data);
         return r;
 }
@@ -2628,7 +2626,7 @@ static int sysctl_uts_string(ctl_table *table, int __user *name, int nlen,
 /* The generic sysctl ipc data routine. */
 static int sysctl_ipc_data(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)
 {
         size_t len;
         void *data;
@@ -2703,41 +2701,41 @@ out:
 
 int sysctl_string(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)
 {
         return -ENOSYS;
 }
 
 int sysctl_intvec(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)
 {
         return -ENOSYS;
 }
 
 int sysctl_jiffies(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)
 {
         return -ENOSYS;
 }
 
 int sysctl_ms_jiffies(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)
 {
         return -ENOSYS;
 }
 
 static int sysctl_uts_string(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)
 {
         return -ENOSYS;
 }
 static int sysctl_ipc_data(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)
 {
         return -ENOSYS;
 }