diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 17:01:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-07 17:01:51 -0400 |
| commit | 48de8cb7847d040c8892701c1ff3c55eff1f46b4 (patch) | |
| tree | 073f1fc21abf098d7667fcb898eda441c6b7f393 /tools/perf | |
| parent | 63634c86365b530af5026d409fd403801abe1e75 (diff) | |
| parent | 134fbadf028a5977a1b06b0253d3ee33e6f0c642 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf, x86: Enable Nehalem-EX support
perf kmem: Fix breakage introduced by 5a0e3ad slab.h script
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/builtin-kmem.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 7d9e3a7e34d3..924a9518931a 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include "util/debug.h" | 14 | #include "util/debug.h" |
| 15 | 15 | ||
| 16 | #include <linux/rbtree.h> | 16 | #include <linux/rbtree.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | 17 | ||
| 19 | struct alloc_stat; | 18 | struct alloc_stat; |
| 20 | typedef int (*sort_fn_t)(struct alloc_stat *, struct alloc_stat *); | 19 | typedef int (*sort_fn_t)(struct alloc_stat *, struct alloc_stat *); |