From 8a44dcc16b1dce546b7137bcec40b9f06775e4ed Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Tue, 3 Aug 2010 07:28:21 +0300
Subject: [PATCH] --- yaml --- r: 206077 b: refs/heads/master c:
 e438444de82f354563d46ee5d991b5916dd19b01 h: refs/heads/master i:   206075:
 92eb1cbf3924538071b16bd6dde6ff9bf97421d2 v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f367dbda5aa9..837ada378f5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af537b0a6c650ab6ff7104d8163e96866b31c835
+refs/heads/master: e438444de82f354563d46ee5d991b5916dd19b01
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 9cf5dae7815e..f0f403693bd9 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -4498,13 +4498,6 @@ static int sysfs_slab_add(struct kmem_cache *s)
 
 static void sysfs_slab_remove(struct kmem_cache *s)
 {
-	if (slab_state < SYSFS)
-		/*
-		 * Sysfs has not been setup yet so no need to remove the
-		 * cache from sysfs.
-		 */
-		return;
-
 	kobject_uevent(&s->kobj, KOBJ_REMOVE);
 	kobject_del(&s->kobj);
 	kobject_put(&s->kobj);