Browse Source

tracing/kmemtrace: export kmemtrace_mark_alloc_node() / kmemtrace_mark_free()

Impact: build fix

Also fix up Kconfig dependencies and include files.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Ingo Molnar 16 years ago
parent
commit
3fd4bc015e
3 changed files with 5 additions and 2 deletions
  1. 2 1
      kernel/trace/Kconfig
  2. 2 0
      kernel/trace/kmemtrace.c
  3. 1 1
      mm/slab.c

+ 2 - 1
kernel/trace/Kconfig

@@ -267,7 +267,8 @@ config HW_BRANCH_TRACER
 config KMEMTRACE
 config KMEMTRACE
 	bool "Trace SLAB allocations"
 	bool "Trace SLAB allocations"
 	select TRACING
 	select TRACING
-	depends on RELAY
+	select MARKERS
+	select RELAY
 	help
 	help
 	  kmemtrace provides tracing for slab allocator functions, such as
 	  kmemtrace provides tracing for slab allocator functions, such as
 	  kmalloc, kfree, kmem_cache_alloc, kmem_cache_free etc.. Collected
 	  kmalloc, kfree, kmem_cache_alloc, kmem_cache_free etc.. Collected

+ 2 - 0
kernel/trace/kmemtrace.c

@@ -296,6 +296,7 @@ void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
 
 
 	trace_wake_up();
 	trace_wake_up();
 }
 }
+EXPORT_SYMBOL(kmemtrace_mark_alloc_node);
 
 
 void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
 void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
 		       unsigned long call_site,
 		       unsigned long call_site,
@@ -325,6 +326,7 @@ void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
 
 
 	trace_wake_up();
 	trace_wake_up();
 }
 }
+EXPORT_SYMBOL(kmemtrace_mark_free);
 
 
 static struct tracer kmem_tracer __read_mostly = {
 static struct tracer kmem_tracer __read_mostly = {
 	.name		= "kmemtrace",
 	.name		= "kmemtrace",

+ 1 - 1
mm/slab.c

@@ -102,7 +102,7 @@
 #include	<linux/cpu.h>
 #include	<linux/cpu.h>
 #include	<linux/sysctl.h>
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
 #include	<linux/module.h>
-#include	<linux/kmemtrace.h>
+#include	<tracing/kmemtrace.h>
 #include	<linux/rcupdate.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
 #include	<linux/string.h>
 #include	<linux/uaccess.h>
 #include	<linux/uaccess.h>