diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-04-06 10:37:33 -0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-04-06 17:48:06 +0200 |
commit | 8c40041f75a202ed6a3b38143b823cb80f6d6b7c (patch) | |
tree | 9eb804e844d7da7171707ac1a2f634ded2b6fc23 /tools | |
parent | 7da23b86e14b77c094b11a9fa5ef5b3758fc9193 (diff) | |
download | linux-8c40041f75a202ed6a3b38143b823cb80f6d6b7c.tar.bz2 |
perf kmem: Fix breakage introduced by 5a0e3ad slab.h script
Commit 5a0e3ad ("include cleanup: Update gfp.h and slab.h
includes to prepare for breaking implicit slab.h inclusion
from percpu.h") added a '#include <linux/slab.h>' to
tools/perf/builtin-kmem.h because: that tool has lines like
this:
if (!strcmp(event->name, "kmalloc") ||
!strcmp(event->name, "kmem_cache_alloc")) {
process_alloc_event(data, event, cpu, timestamp, thread, 0);
return;
}
So, using the script regex:
>>> import re
>>> s = re.compile(r'^(|.*[^a-zA-Z0-9_])_*(slab_is_available|kmem_cache_|k[mzc]alloc|krealloc|kz?free|ksize|__getname|putname)')
>>> l = ' !strcmp(event->name, "kmem_cache_alloc")) {'
>>> s.search(l)
<_sre.SRE_Match object at 0xb77b1ad0>
>>>
Remove that file that is not available in the tools/perf include
path and thus builtin-kmem.c couldn't be compiled.
Reported-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Tejun Heo <tj@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1270561053-14308-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
-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 @@ #include "util/debug.h" #include <linux/rbtree.h> -#include <linux/slab.h> struct alloc_stat; typedef int (*sort_fn_t)(struct alloc_stat *, struct alloc_stat *); |