diff --git a/[refs] b/[refs]
index 3ce130dc7268..86a038d1022e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ce745ed39d35f9d547d00d406db2be7c6c175b3
+refs/heads/master: 364fbb29a0105863d76a1f7bbc01783a4af30a75
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 21b2aef25254..ae440b5ba60e 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -4033,10 +4033,8 @@ static int enable_cpucache(struct kmem_cache *cachep)
 	 * to a larger limit. Thus disabled by default.
 	 */
 	shared = 0;
-#ifdef CONFIG_SMP
-	if (cachep->buffer_size <= PAGE_SIZE)
+	if (cachep->buffer_size <= PAGE_SIZE && num_possible_cpus() > 1)
 		shared = 8;
-#endif
 
 #if DEBUG
 	/*