1 files changed, 3 insertions, 2 deletions

diff --git a/init/main.c b/init/main.c
index 07c8658ffca5..3585f073d636 100644
--- a/init/main.c
+++ b/init/main.c
@@ -71,6 +71,7 @@
 #include <asm/setup.h>
 #include <asm/sections.h>
 #include <asm/cacheflush.h>
+#include <trace/kmemtrace.h>
 
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/smp.h>
@@ -648,6 +649,7 @@ asmlinkage void __init start_kernel(void)
         enable_debug_pagealloc();
         cpu_hotplug_init();
         kmem_cache_init();
+        kmemtrace_init();
         debug_objects_mem_init();
         idr_init_cache();
         setup_per_cpu_pageset();
@@ -769,6 +771,7 @@ static void __init do_basic_setup(void)
 {
         rcu_init_sched(); /* needed by module_init stage. */
         init_workqueues();
+        cpuset_init_smp();
         usermodehelper_init();
         driver_init();
         init_irq_proc();
@@ -863,8 +866,6 @@ static int __init kernel_init(void * unused)
         smp_init();
         sched_init_smp();
 
-        cpuset_init_smp();
-
         do_basic_setup();
 
         /*