summaryrefslogtreecommitdiffstats
path: root/include/linux/slub_def.h
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2010-05-26 17:22:17 +0800
committerFrederic Weisbecker <fweisbec@gmail.com>2010-06-09 17:31:22 +0200
commit039ca4e74a1cf60bd7487324a564ecf5c981f254 (patch)
tree61c6fa8409961d2e22ef9d04ac54442734ebd41a /include/linux/slub_def.h
parent30dbb20e68e6f7df974b77d2350ebad5eb6f6c9e (diff)
downloadlinux-039ca4e74a1cf60bd7487324a564ecf5c981f254.tar.gz
linux-039ca4e74a1cf60bd7487324a564ecf5c981f254.tar.bz2
linux-039ca4e74a1cf60bd7487324a564ecf5c981f254.zip
tracing: Remove kmemtrace ftrace plugin
We have been resisting new ftrace plugins and removing existing ones, and kmemtrace has been superseded by kmem trace events and perf-kmem, so we remove it. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> Cc: Ingo Molnar <mingo@elte.hu> Cc: Steven Rostedt <rostedt@goodmis.org> [ remove kmemtrace from the makefile, handle slob too ] Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'include/linux/slub_def.h')
-rw-r--r--include/linux/slub_def.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 55695c8d2f8a..2345d3a033e6 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -10,9 +10,10 @@
#include <linux/gfp.h>
#include <linux/workqueue.h>
#include <linux/kobject.h>
-#include <linux/kmemtrace.h>
#include <linux/kmemleak.h>
+#include <trace/events/kmem.h>
+
enum stat_item {
ALLOC_FASTPATH, /* Allocation from cpu slab */
ALLOC_SLOWPATH, /* Allocation by getting a new cpu slab */