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 /mm/slub.c | |
| 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-c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8.tar.xz linux-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 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index 578f68f3c51f..7bb7940f4eee 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -17,7 +17,6 @@ #include <linux/slab.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> -#include <linux/kmemtrace.h> #include <linux/kmemcheck.h> #include <linux/cpu.h> #include <linux/cpuset.h> |