2 files changed, 34 insertions, 35 deletions

diff --git a/mm/slab.c b/mm/slab.c
index b03b2e46b806..ff31261fd24f 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -304,11 +304,11 @@ struct kmem_list3 {
 /*
  * Need this for bootstrapping a per node allocator.
  */
-#define NUM_INIT_LISTS (2 * MAX_NUMNODES + 1)
+#define NUM_INIT_LISTS (3 * MAX_NUMNODES)
 struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
 #define CACHE_CACHE 0
-#define SIZE_AC 1
-#define SIZE_L3 (1 + MAX_NUMNODES)
+#define SIZE_AC MAX_NUMNODES
+#define SIZE_L3 (2 * MAX_NUMNODES)
 
 static int drain_freelist(struct kmem_cache *cache,
                         struct kmem_list3 *l3, int tofree);
@@ -1410,6 +1410,22 @@ static void init_list(struct kmem_cache *cachep, struct kmem_list3 *list,
 }
 
 /*
+ * For setting up all the kmem_list3s for cache whose buffer_size is same as
+ * size of kmem_list3.
+ */
+static void __init set_up_list3s(struct kmem_cache *cachep, int index)
+{
+        int node;
+
+        for_each_online_node(node) {
+                cachep->nodelists[node] = &initkmem_list3[index + node];
+                cachep->nodelists[node]->next_reap = jiffies +
+                    REAPTIMEOUT_LIST3 +
+                    ((unsigned long)cachep) % REAPTIMEOUT_LIST3;
+        }
+}
+
+/*
  * Initialisation.  Called after the page allocator have been initialised and
  * before smp_init().
  */
@@ -1432,6 +1448,7 @@ void __init kmem_cache_init(void)
                 if (i < MAX_NUMNODES)
                         cache_cache.nodelists[i] = NULL;
         }
+        set_up_list3s(&cache_cache, CACHE_CACHE);
 
         /*
          * Fragmentation resistance on low memory - only use bigger
@@ -1587,10 +1604,9 @@ void __init kmem_cache_init(void)
         {
                 int nid;
 
-                /* Replace the static kmem_list3 structures for the boot cpu */
-                init_list(&cache_cache, &initkmem_list3[CACHE_CACHE], node);
-
                 for_each_online_node(nid) {
+                        init_list(&cache_cache, &initkmem_list3[CACHE_CACHE], nid);
+
                         init_list(malloc_sizes[INDEX_AC].cs_cachep,
                                   &initkmem_list3[SIZE_AC + nid], nid);
 
@@ -1960,22 +1976,6 @@ static void slab_destroy(struct kmem_cache *cachep, struct slab *slabp)
         }
 }
 
-/*
- * For setting up all the kmem_list3s for cache whose buffer_size is same as
- * size of kmem_list3.
- */
-static void __init set_up_list3s(struct kmem_cache *cachep, int index)
-{
-        int node;
-
-        for_each_online_node(node) {
-                cachep->nodelists[node] = &initkmem_list3[index + node];
-                cachep->nodelists[node]->next_reap = jiffies +
-                    REAPTIMEOUT_LIST3 +
-                    ((unsigned long)cachep) % REAPTIMEOUT_LIST3;
-        }
-}
-
 static void __kmem_cache_destroy(struct kmem_cache *cachep)
 {
         int i;
@@ -2099,7 +2099,7 @@ static int __init_refok setup_cpu_cache(struct kmem_cache *cachep)
                         g_cpucache_up = PARTIAL_L3;
                 } else {
                         int node;
-                        for_each_node_state(node, N_NORMAL_MEMORY) {
+                        for_each_online_node(node) {
                                 cachep->nodelists[node] =
                                     kmalloc_node(sizeof(struct kmem_list3),
                                                 GFP_KERNEL, node);
diff --git a/mm/slub.c b/mm/slub.c
index 474945ecd89d..5cc4b7dddb50 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3962,7 +3962,7 @@ static struct kset_uevent_ops slab_uevent_ops = {
         .filter = uevent_filter,
 };
 
-static decl_subsys(slab, &slab_ktype, &slab_uevent_ops);
+static struct kset *slab_kset;
 
 #define ID_STR_LENGTH 64
 
@@ -4015,7 +4015,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
                  * This is typically the case for debug situations. In that
                  * case we can catch duplicate names easily.
                  */
-                sysfs_remove_link(&slab_subsys.kobj, s->name);
+                sysfs_remove_link(&slab_kset->kobj, s->name);
                 name = s->name;
         } else {
                 /*
@@ -4025,12 +4025,12 @@ static int sysfs_slab_add(struct kmem_cache *s)
                 name = create_unique_id(s);
         }
 
-        kobj_set_kset_s(s, slab_subsys);
-        kobject_set_name(&s->kobj, name);
-        kobject_init(&s->kobj);
-        err = kobject_add(&s->kobj);
-        if (err)
+        s->kobj.kset = slab_kset;
+        err = kobject_init_and_add(&s->kobj, &slab_ktype, NULL, name);
+        if (err) {
+                kobject_put(&s->kobj);
                 return err;
+        }
 
         err = sysfs_create_group(&s->kobj, &slab_attr_group);
         if (err)
@@ -4070,9 +4070,8 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
                 /*
                  * If we have a leftover link then remove it.
                  */
-                sysfs_remove_link(&slab_subsys.kobj, name);
-                return sysfs_create_link(&slab_subsys.kobj,
-                                                &s->kobj, name);
+                sysfs_remove_link(&slab_kset->kobj, name);
+                return sysfs_create_link(&slab_kset->kobj, &s->kobj, name);
         }
 
         al = kmalloc(sizeof(struct saved_alias), GFP_KERNEL);
@@ -4091,8 +4090,8 @@ static int __init slab_sysfs_init(void)
         struct kmem_cache *s;
         int err;
 
-        err = subsystem_register(&slab_subsys);
-        if (err) {
+        slab_kset = kset_create_and_add("slab", &slab_uevent_ops, kernel_kobj);
+        if (!slab_kset) {
                 printk(KERN_ERR "Cannot register slab subsystem.\n");
                 return -ENOSYS;
         }