aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds2007-05-07 12:31:58 -0700
committerLinus Torvalds2007-05-07 12:31:58 -0700
commit0f9008ef38d5a6305d94bbdd8f20d68fc75c63b6 (patch)
tree046dd1a4f68593fa2be9d2e157111f70b448525a
parent5cefcab3db2b13093480f2a42bf081574dd72d3d (diff)
Fix up SLUB compile
The newly merged SLUB allocator patches had been generated before the removal of "struct subsystem", and ended up applying fine, but wouldn't build based on the current tree as a result. Fix up that merge error - not that SLUB is likely really ready for showtime yet, but at least I can fix the trivial stuff. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/slub.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c
index a6323484dd3e..5db3da5a60bf 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3418,7 +3418,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.kset.kobj, s->name);
+ sysfs_remove_link(&slab_subsys.kobj, s->name);
name = s->name;
} else {
/*
@@ -3473,8 +3473,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.kset.kobj, name);
- return sysfs_create_link(&slab_subsys.kset.kobj,
+ sysfs_remove_link(&slab_subsys.kobj, name);
+ return sysfs_create_link(&slab_subsys.kobj,
&s->kobj, name);
}