2 files changed, 6 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 2d964fa40f5b..4986ecc49e65 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -827,6 +827,11 @@ config SCHED_AUTOGROUP
           desktop applications.  Task group autogeneration is currently based
           upon task session.
 
+config SCHED_TTWU_QUEUE
+        bool
+        depends on !SPARC32
+        default y
+
 config MM_OWNER
         bool
 
@@ -1226,7 +1231,6 @@ config SLAB
           per cpu and per node queues.
 
 config SLUB
-        depends on BROKEN || NUMA || !DISCONTIGMEM
         bool "SLUB (Unqueued Allocator)"
         help
            SLUB is a slab allocator that minimizes cache line usage
diff --git a/init/main.c b/init/main.c
index 4a9479ef4540..48df882d51d2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -580,8 +580,8 @@ asmlinkage void __init start_kernel(void)
 #endif
         page_cgroup_init();
         enable_debug_pagealloc();
-        kmemleak_init();
         debug_objects_mem_init();
+        kmemleak_init();
         setup_per_cpu_pageset();
         numa_policy_init();
         if (late_time_init)