Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

1 files changed, 55 insertions, 9 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 052e7d64537e..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>
@@ -406,7 +407,7 @@ struct kmem_cache {
         unsigned int dflags;            /* dynamic flags */
 
         /* constructor func */
-        void (*ctor)(struct kmem_cache *, void *);
+        void (*ctor)(void *obj);
 
 /* 5) cache creation/removal */
         const char *name;
@@ -2137,8 +2138,7 @@ static int __init_refok setup_cpu_cache(struct kmem_cache *cachep)
  */
 struct kmem_cache *
 kmem_cache_create (const char *name, size_t size, size_t align,
-        unsigned long flags,
-        void (*ctor)(struct kmem_cache *, void *))
+        unsigned long flags, void (*ctor)(void *))
 {
         size_t left_over, slab_size, ralign;
         struct kmem_cache *cachep = NULL, *pc;
@@ -2653,7 +2653,7 @@ static void cache_init_objs(struct kmem_cache *cachep,
                  * They must also be threaded.
                  */
                 if (cachep->ctor && !(cachep->flags & SLAB_POISON))
-                        cachep->ctor(cachep, objp + obj_offset(cachep));
+                        cachep->ctor(objp + obj_offset(cachep));
 
                 if (cachep->flags & SLAB_RED_ZONE) {
                         if (*dbg_redzone2(cachep, objp) != RED_INACTIVE)
@@ -2669,7 +2669,7 @@ static void cache_init_objs(struct kmem_cache *cachep,
                                          cachep->buffer_size / PAGE_SIZE, 0);
 #else
                 if (cachep->ctor)
-                        cachep->ctor(cachep, objp);
+                        cachep->ctor(objp);
 #endif
                 slab_bufctl(slabp)[i] = i + 1;
         }
@@ -3093,7 +3093,7 @@ static void *cache_alloc_debugcheck_after(struct kmem_cache *cachep,
 #endif
         objp += obj_offset(cachep);
         if (cachep->ctor && cachep->flags & SLAB_POISON)
-                cachep->ctor(cachep, objp);
+                cachep->ctor(objp);
 #if ARCH_SLAB_MINALIGN
         if ((u32)objp & (ARCH_SLAB_MINALIGN-1)) {
                 printk(KERN_ERR "0x%p: not aligned to ARCH_SLAB_MINALIGN=%d\n",
@@ -4259,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,
@@ -4316,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)
@@ -4444,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
 
 /**
@@ -4473,4 +4520,3 @@ size_t ksize(const void *objp)
 
         return obj_size(virt_to_cache(objp));
 }
-EXPORT_SYMBOL(ksize);