From 92eb1cbf3924538071b16bd6dde6ff9bf97421d2 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux-foundation.org>
Date: Fri, 9 Jul 2010 14:07:13 -0500
Subject: [PATCH] --- yaml --- r: 206075 b: refs/heads/master c:
 f5b801ac38a9612b380ee9a75ab1861f0594e79f h: refs/heads/master i:   206073:
 fbb93d907265f31c45b1f26b43313e6c748d5ada   206071:
 01b2f93b952e27a8eb235470b7bbc257c724571c v: v3

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

diff --git a/[refs] b/[refs]
index 16717b9eca5c..983395c436b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7278bd7d1aab5c6d35fd271eeb860548f0bd0bb
+refs/heads/master: f5b801ac38a9612b380ee9a75ab1861f0594e79f
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 8655be5b7404..b89a7c99b2fa 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -4507,6 +4507,13 @@ 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);