diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-06-09 18:55:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-09 18:55:57 +0200 |
| commit | c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8 (patch) | |
| tree | 3f44aa013d31d34951e9610e79ff14c1148ad6ac /include/linux/slub_def.h | |
| parent | perf: Fix build breakage for architecutes without atomic64_t (diff) | |
| parent | x86: Unify save_stack_address() and save_stack_address_nosched() (diff) | |
| download | linux-dev-c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8.tar.xz linux-dev-c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8.zip | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'include/linux/slub_def.h')
| -rw-r--r-- | include/linux/slub_def.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index 4ba59cfc1f75..6447a723ecb1 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 */ |