KVM: Portability: Move kvm_vcpu_stat to x86.h

[linux-2.6] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index b6c79462157e85637016ea07e0ee646455b8f6d9..5cc4b7dddb505dc08a9a05bdfeb2cc1f91faf9c2 100644 (file)
--- a/mm/slub.c
+++ b/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)
@@ -4091,8 +4090,7 @@ static int __init slab_sysfs_init(void)
        struct kmem_cache *s;
        int err;
 
-       slab_kset = kset_create_and_add("slab", &slab_uevent_ops,
-                                       &kernel_kset->kobj);
+       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;