1 files changed, 50 insertions, 2 deletions

diff --git a/mm/slab.c b/mm/slab.c
index e76eee466886..09187517f9dc 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -95,6 +95,7 @@
 #include        <linux/init.h>
 #include        <linux/compiler.h>
 #include        <linux/cpuset.h>
+#include        <linux/proc_fs.h>
 #include        <linux/seq_file.h>
 #include        <linux/notifier.h>
 #include        <linux/kallsyms.h>
@@ -4258,7 +4259,7 @@ static int s_show(struct seq_file *m, void *p)
  * + further values on SMP and with statistics enabled
  */
 
-const struct seq_operations slabinfo_op = {
+static const struct seq_operations slabinfo_op = {
         .start = s_start,
         .next = s_next,
         .stop = s_stop,
@@ -4315,6 +4316,19 @@ ssize_t slabinfo_write(struct file *file, const char __user * buffer,
         return res;
 }
 
+static int slabinfo_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &slabinfo_op);
+}
+
+static const struct file_operations proc_slabinfo_operations = {
+        .open           = slabinfo_open,
+        .read           = seq_read,
+        .write          = slabinfo_write,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
 #ifdef CONFIG_DEBUG_SLAB_LEAK
 
 static void *leaks_start(struct seq_file *m, loff_t *pos)
@@ -4443,13 +4457,47 @@ static int leaks_show(struct seq_file *m, void *p)
         return 0;
 }
 
-const struct seq_operations slabstats_op = {
+static const struct seq_operations slabstats_op = {
         .start = leaks_start,
         .next = s_next,
         .stop = s_stop,
         .show = leaks_show,
 };
+
+static int slabstats_open(struct inode *inode, struct file *file)
+{
+        unsigned long *n = kzalloc(PAGE_SIZE, GFP_KERNEL);
+        int ret = -ENOMEM;
+        if (n) {
+                ret = seq_open(file, &slabstats_op);
+                if (!ret) {
+                        struct seq_file *m = file->private_data;
+                        *n = PAGE_SIZE / (2 * sizeof(unsigned long));
+                        m->private = n;
+                        n = NULL;
+                }
+                kfree(n);
+        }
+        return ret;
+}
+
+static const struct file_operations proc_slabstats_operations = {
+        .open           = slabstats_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release_private,
+};
+#endif
+
+static int __init slab_proc_init(void)
+{
+        proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
+#ifdef CONFIG_DEBUG_SLAB_LEAK
+        proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
 #endif
+        return 0;
+}
+module_init(slab_proc_init);
 #endif
 
 /**