[PATCH] perf kmem: Fix breakage introduced by 5a0e3ad slab.h script

[PATCH] perf kmem: Fix breakage introduced by 5a0e3ad slab.h script

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

The 5a0e3ad changeset 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: Ingo Molnar <mingo@elte.hu>
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>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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 7d9e3a7..924a951 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 *);
-- 
1.6.2.5

Re: [tip:perf/urgent] perf kmem: Fix breakage introduced by 5a0e3ad slab.h script

[Tejun Heo]

On 04/07/2010 12:51 AM, tip-bot for Arnaldo Carvalho de Melo wrote:
> Commit-ID:  8c40041f75a202ed6a3b38143b823cb80f6d6b7c
> Gitweb:     http://git.kernel.org/tip/8c40041f75a202ed6a3b38143b823cb80f6d6b7c
> Author:     Arnaldo Carvalho de Melo <acme@redhat.com>
> AuthorDate: Tue, 6 Apr 2010 10:37:33 -0300
> Committer:  Ingo Molnar <mingo@elte.hu>
> CommitDate: Tue, 6 Apr 2010 17:48:06 +0200
> 
> perf kmem: Fix breakage introduced by 5a0e3ad slab.h script

Thanks.

-- 
tejun