3 files changed, 6 insertions, 17 deletions

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 7555ce99f6d2..455f9affea9a 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -14,7 +14,7 @@
 #include <asm/page.h>           /* kmalloc_sizes.h needs PAGE_SIZE */
 #include <asm/cache.h>          /* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <linux/compiler.h>
-#include <linux/kmemtrace.h>
+#include <trace/kmemtrace.h>
 
 /* Size description struct for general caches. */
 struct cache_sizes {
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index dc28432b5b9a..6b657f7dcb2b 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -10,7 +10,7 @@
 #include <linux/gfp.h>
 #include <linux/workqueue.h>
 #include <linux/kobject.h>
-#include <linux/kmemtrace.h>
+#include <trace/kmemtrace.h>
 
 enum stat_item {
         ALLOC_FASTPATH,         /* Allocation from cpu slab */
diff --git a/include/linux/kmemtrace.h b/include/trace/kmemtrace.h
index 5bea8ead6a6b..ad8b7857855a 100644
--- a/include/linux/kmemtrace.h
+++ b/include/trace/kmemtrace.h
@@ -22,28 +22,17 @@ enum kmemtrace_type_id {
 
 extern void kmemtrace_init(void);
 
-static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
+extern void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
                                              unsigned long call_site,
                                              const void *ptr,
                                              size_t bytes_req,
                                              size_t bytes_alloc,
                                              gfp_t gfp_flags,
-                                             int node)
-{
-        trace_mark(kmemtrace_alloc, "type_id %d call_site %lu ptr %lu "
-                   "bytes_req %lu bytes_alloc %lu gfp_flags %lu node %d",
-                   type_id, call_site, (unsigned long) ptr,
-                   (unsigned long) bytes_req, (unsigned long) bytes_alloc,
-                   (unsigned long) gfp_flags, node);
-}
+                                             int node);
 
-static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
+extern void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
                                        unsigned long call_site,
-                                       const void *ptr)
-{
-        trace_mark(kmemtrace_free, "type_id %d call_site %lu ptr %lu",
-                   type_id, call_site, (unsigned long) ptr);
-}
+                                       const void *ptr);
 
 #else /* CONFIG_KMEMTRACE */