Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

[net-next-2.6.git] / include / linux / slub_def.h

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 4ba59cfc1f7562c0bb8cb900c4f8d444554d25d5..6447a723ecb170b9c3fd4476e8a1c1016b2b69de 100644 (file)
--- 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 */