diff --git a/[refs] b/[refs]
index a2c4d924b243..5a83b2591095 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7de6b8057976584e5a422574cae4dd21c677b4d4
+refs/heads/master: 561ccd3a97867ed33e1670feeca3391cd4d6fa2c
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 9b1adb176ea8..a3f83e2c8250 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -450,7 +450,7 @@ config SHMEM
 
 config SLAB
 	default y
-	bool "Use full SLAB allocator" if EMBEDDED
+	bool "Use full SLAB allocator" if (EMBEDDED && !SMP && !SPARSEMEM)
 	help
 	  Disabling this replaces the advanced SLAB allocator and
 	  kmalloc support with the drastically simpler SLOB allocator.