1 files changed, 25 insertions, 12 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 0c83e6afe7b2..a2cd47d89e0a 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -14,6 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/slab.h>
+#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
@@ -2930,8 +2931,10 @@ static int slab_memory_callback(struct notifier_block *self,
         case MEM_CANCEL_OFFLINE:
                 break;
         }
-
-        ret = notifier_from_errno(ret);
+        if (ret)
+                ret = notifier_from_errno(ret);
+        else
+                ret = NOTIFY_OK;
         return ret;
 }
 
@@ -3594,7 +3597,7 @@ static int list_locations(struct kmem_cache *s, char *buf,
         for (i = 0; i < t.count; i++) {
                 struct location *l = &t.loc[i];
 
-                if (len > PAGE_SIZE - 100)
+                if (len > PAGE_SIZE - KSYM_SYMBOL_LEN - 100)
                         break;
                 len += sprintf(buf + len, "%7ld ", l->count);
 
@@ -4417,14 +4420,6 @@ __initcall(slab_sysfs_init);
  * The /proc/slabinfo ABI
  */
 #ifdef CONFIG_SLABINFO
-
-ssize_t slabinfo_write(struct file *file, const char __user *buffer,
-                       size_t count, loff_t *ppos)
-{
-        return -EINVAL;
-}
-
-
 static void print_slabinfo_header(struct seq_file *m)
 {
         seq_puts(m, "slabinfo - version: 2.1\n");
@@ -4492,11 +4487,29 @@ static int s_show(struct seq_file *m, void *p)
         return 0;
 }
 
-const struct seq_operations slabinfo_op = {
+static const struct seq_operations slabinfo_op = {
         .start = s_start,
         .next = s_next,
         .stop = s_stop,
         .show = s_show,
 };
 
+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,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
+static int __init slab_proc_init(void)
+{
+        proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
+        return 0;
+}
+module_init(slab_proc_init);
 #endif /* CONFIG_SLABINFO */