aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig2
-rw-r--r--init/main.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index f068071fcc5d..26b5bab6f6e8 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -945,7 +945,7 @@ config TRACEPOINTS
945 945
946config MARKERS 946config MARKERS
947 bool "Activate markers" 947 bool "Activate markers"
948 depends on TRACEPOINTS 948 select TRACEPOINTS
949 help 949 help
950 Place an empty function call at each marker site. Can be 950 Place an empty function call at each marker site. Can be
951 dynamically changed for a probe function. 951 dynamically changed for a probe function.
diff --git a/init/main.c b/init/main.c
index 844209453c02..db7974ff7a0a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -70,6 +70,7 @@
70#include <asm/setup.h> 70#include <asm/setup.h>
71#include <asm/sections.h> 71#include <asm/sections.h>
72#include <asm/cacheflush.h> 72#include <asm/cacheflush.h>
73#include <trace/kmemtrace.h>
73 74
74#ifdef CONFIG_X86_LOCAL_APIC 75#ifdef CONFIG_X86_LOCAL_APIC
75#include <asm/smp.h> 76#include <asm/smp.h>
@@ -641,6 +642,7 @@ asmlinkage void __init start_kernel(void)
641 enable_debug_pagealloc(); 642 enable_debug_pagealloc();
642 cpu_hotplug_init(); 643 cpu_hotplug_init();
643 kmem_cache_init(); 644 kmem_cache_init();
645 kmemtrace_init();
644 debug_objects_mem_init(); 646 debug_objects_mem_init();
645 idr_init_cache(); 647 idr_init_cache();
646 setup_per_cpu_pageset(); 648 setup_per_cpu_pageset();