diff --git a/[refs] b/[refs]
index 8291b4acda87..eabbb88849c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf15126b3d4511e06e5299781ab74922590900be
+refs/heads/master: 1eada11c88251e0a30ce5690d2607bb4293b3564
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index d26177fb293b..5cc4b7dddb50 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -4025,13 +4025,12 @@ static int sysfs_slab_add(struct kmem_cache *s)
 		name = create_unique_id(s);
 	}
 
-	kobject_set_name(&s->kobj, name);
 	s->kobj.kset = slab_kset;
-	s->kobj.ktype = &slab_ktype;
-	kobject_init(&s->kobj);
-	err = kobject_add(&s->kobj);
-	if (err)
+	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)