Skip to content

Commit

Permalink
Fix up SLUB compile
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Torvalds committed May 7, 2007
1 parent 5cefcab commit 0f9008e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
/*
Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 0f9008e

Please sign in to comment.