• Arnaldo Carvalho de Melo's avatar
    perf kmem: Fix breakage introduced by 5a0e3ad6 slab.h script · 8c40041f
    Arnaldo Carvalho de Melo authored
    Commit 5a0e3ad6 ("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: default avatarPeter 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: default avatarIngo Molnar <mingo@elte.hu>
    8c40041f
builtin-kmem.c 17 KB