mm: Expose untagging mask in /proc/$PID/status

[linux-2.6-microblaze.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 137d4ab..1c240d2 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -425,21 +425,6 @@ static void proc_put_char(void **buf, size_t *size, char c)
        }
 }
 
-static int do_proc_dobool_conv(bool *negp, unsigned long *lvalp,
-                               int *valp,
-                               int write, void *data)
-{
-       if (write) {
-               *(bool *)valp = *lvalp;
-       } else {
-               int val = *(bool *)valp;
-
-               *lvalp = (unsigned long)val;
-               *negp = false;
-       }
-       return 0;
-}
-
 static int do_proc_dointvec_conv(bool *negp, unsigned long *lvalp,
                                 int *valp,
                                 int write, void *data)
@@ -710,16 +695,36 @@ int do_proc_douintvec(struct ctl_table *table, int write,
  * @lenp: the size of the user buffer
  * @ppos: file position
  *
- * Reads/writes up to table->maxlen/sizeof(unsigned int) integer
- * values from/to the user buffer, treated as an ASCII string.
+ * Reads/writes one integer value from/to the user buffer,
+ * treated as an ASCII string.
+ *
+ * table->data must point to a bool variable and table->maxlen must
+ * be sizeof(bool).
  *
  * Returns 0 on success.
  */
 int proc_dobool(struct ctl_table *table, int write, void *buffer,
                size_t *lenp, loff_t *ppos)
 {
-       return do_proc_dointvec(table, write, buffer, lenp, ppos,
-                               do_proc_dobool_conv, NULL);
+       struct ctl_table tmp;
+       bool *data = table->data;
+       int res, val;
+
+       /* Do not support arrays yet. */
+       if (table->maxlen != sizeof(bool))
+               return -EINVAL;
+
+       tmp = *table;
+       tmp.maxlen = sizeof(val);
+       tmp.data = &val;
+
+       val = READ_ONCE(*data);
+       res = proc_dointvec(&tmp, write, buffer, lenp, ppos);
+       if (res)
+               return res;
+       if (write)
+               WRITE_ONCE(*data, val);
+       return 0;
 }
 
 /**