aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slub.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-06 13:36:58 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:24 -0500
commit0ff21e46630abce11fdaaffabd72bbd4eed5ac2c (patch)
treecc49671622ef90775bf12a91d20b8286aa346e6f /mm/slub.c
parent5c03c7ab886859eb195440dbb6ccb8c30c4e84cc (diff)
kobject: convert kernel_kset to be a kobject
kernel_kset does not need to be a kset, but a much simpler kobject now that we have kobj_attributes. We also rename kernel_kset to kernel_kobj to catch all users of this symbol with a build error instead of an easy-to-ignore build warning. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c
index b6c79462157e..d26177fb293b 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4091,8 +4091,7 @@ static int __init slab_sysfs_init(void)
4091 struct kmem_cache *s; 4091 struct kmem_cache *s;
4092 int err; 4092 int err;
4093 4093
4094 slab_kset = kset_create_and_add("slab", &slab_uevent_ops, 4094 slab_kset = kset_create_and_add("slab", &slab_uevent_ops, kernel_kobj);
4095 &kernel_kset->kobj);
4096 if (!slab_kset) { 4095 if (!slab_kset) {
4097 printk(KERN_ERR "Cannot register slab subsystem.\n"); 4096 printk(KERN_ERR "Cannot register slab subsystem.\n");
4098 return -ENOSYS; 4097 return -ENOSYS;