Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent

[deliverable/linux.git] / kernel / trace / kmemtrace.c

diff --git a/kernel/trace/kmemtrace.c b/kernel/trace/kmemtrace.c
index 2bfdcd3262262f4089d4c3f01d6dae995936de76..faaa5ae7e75a44831cd065a6e483e9d5a47b7057 100644 (file)
--- a/kernel/trace/kmemtrace.c
+++ b/kernel/trace/kmemtrace.c
@@ -337,6 +337,11 @@ static struct tracer kmem_tracer __read_mostly = {
        .flags          = &kmem_tracer_flags
 };
 
+void kmemtrace_init(void)
+{
+       /* earliest opportunity to start kmem tracing */
+}
+
 static int __init init_kmem_tracer(void)
 {
        return register_tracer(&kmem_tracer);