Fix up SLUB compile (0f9008ef) · Commits · 戴 / test

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>

mm/slub.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message