From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 7 May 2007 19:31:58 +0000 (-0700)
Subject: Fix up SLUB compile
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f9008ef38d5a6305d94bbdd8f20d68fc75c63b6;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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>
---

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);
 	}