aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-30 12:07:27 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-30 16:06:00 +0100
commit3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e (patch)
tree7c33ee197cd97b72a44c0991ff4abc4c36f3a45c
parentb6ab4afee4ed56d0f69df59485585cff828c327d (diff)
downloadmrst-s0i3-test-3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e.tar.gz
mrst-s0i3-test-3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e.tar.xz
mrst-s0i3-test-3fd4bc015ef879a7d2b955ce97fb125e3a51ba7e.zip
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>
-rw-r--r--kernel/trace/Kconfig3
-rw-r--r--kernel/trace/kmemtrace.c2
-rw-r--r--mm/slab.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 27fb74b06b3..cc9f91e7daf 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -267,7 +267,8 @@ config HW_BRANCH_TRACER
config KMEMTRACE
bool "Trace SLAB allocations"
select TRACING
- depends on RELAY
+ select MARKERS
+ select RELAY
help
kmemtrace provides tracing for slab allocator functions, such as
kmalloc, kfree, kmem_cache_alloc, kmem_cache_free etc.. Collected
diff --git a/kernel/trace/kmemtrace.c b/kernel/trace/kmemtrace.c
index d69cbe3c2a4..2bfdcd32622 100644
--- a/kernel/trace/kmemtrace.c
+++ b/kernel/trace/kmemtrace.c
@@ -296,6 +296,7 @@ void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
trace_wake_up();
}
+EXPORT_SYMBOL(kmemtrace_mark_alloc_node);
void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
unsigned long call_site,
@@ -325,6 +326,7 @@ void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
trace_wake_up();
}
+EXPORT_SYMBOL(kmemtrace_mark_free);
static struct tracer kmem_tracer __read_mostly = {
.name = "kmemtrace",
diff --git a/mm/slab.c b/mm/slab.c
index bcf08ea8838..7f72bb386a0 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -102,7 +102,7 @@
#include <linux/cpu.h>
#include <linux/sysctl.h>
#include <linux/module.h>
-#include <linux/kmemtrace.h>
+#include <tracing/kmemtrace.h>
#include <linux/rcupdate.h>
#include <linux/string.h>
#include <linux/uaccess.h>