From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail137.messagelabs.com (mail137.messagelabs.com [216.82.249.19]) by kanga.kvack.org (Postfix) with SMTP id 9212C6B021A for ; Wed, 26 May 2010 11:54:07 -0400 (EDT) Received: by fxm11 with SMTP id 11so4221924fxm.14 for ; Wed, 26 May 2010 08:54:05 -0700 (PDT) Date: Wed, 26 May 2010 17:54:03 +0200 From: Frederic Weisbecker Subject: Re: [PATCH] tracing: Remove kmemtrace ftrace plugin Message-ID: <20100526155401.GB5299@nowhere> References: <4BFCE849.7090804@cn.fujitsu.com> <20100526153843.GA6868@localhost> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100526153843.GA6868@localhost> Sender: owner-linux-mm@kvack.org To: Eduard - Gabriel Munteanu Cc: Li Zefan , Ingo Molnar , Steven Rostedt , Pekka Enberg , LKML , linux-mm@kvack.org List-ID: On Wed, May 26, 2010 at 06:38:43PM +0300, Eduard - Gabriel Munteanu wrote: > On Wed, May 26, 2010 at 05:22:17PM +0800, Li Zefan wrote: > > We have been resisting new ftrace plugins and removing existing > > ones, and kmemtrace has been superseded by kmem trace events > > and perf-kmem, so we remove it. > > > > Signed-off-by: Li Zefan > > Acked-by: Pekka Enberg > > --- > > Documentation/ABI/testing/debugfs-kmemtrace | 71 ---- > > Documentation/trace/kmemtrace.txt | 126 ------- > > MAINTAINERS | 7 - > > include/linux/kmemtrace.h | 25 -- > > include/linux/slab_def.h | 3 +- > > include/linux/slub_def.h | 3 +- > > init/main.c | 2 - > > kernel/trace/Kconfig | 20 - > > kernel/trace/kmemtrace.c | 529 --------------------------- > > kernel/trace/trace.h | 13 - > > kernel/trace/trace_entries.h | 35 -- > > mm/slab.c | 1 - > > mm/slub.c | 1 - > > 13 files changed, 4 insertions(+), 832 deletions(-) > > delete mode 100644 Documentation/ABI/testing/debugfs-kmemtrace > > delete mode 100644 Documentation/trace/kmemtrace.txt > > delete mode 100644 include/linux/kmemtrace.h > > delete mode 100644 kernel/trace/kmemtrace.c > > Oh my, this one started quite a massacre judging by other replies! :-) > > [snip] > > > diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h > > index 1812dac..1acfa73 100644 > > --- a/include/linux/slab_def.h > > +++ b/include/linux/slab_def.h > > @@ -14,7 +14,8 @@ > > #include /* kmalloc_sizes.h needs PAGE_SIZE */ > > #include /* kmalloc_sizes.h needs L1_CACHE_BYTES */ > > #include > > -#include > > + > > +#include > > > > #ifndef ARCH_KMALLOC_MINALIGN > > /* > > diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h > > index 55695c8..2345d3a 100644 > > --- a/include/linux/slub_def.h > > +++ b/include/linux/slub_def.h > > @@ -10,9 +10,10 @@ > > #include > > #include > > #include > > -#include > > #include > > > > +#include > > + > > enum stat_item { > > ALLOC_FASTPATH, /* Allocation from cpu slab */ > > ALLOC_SLOWPATH, /* Allocation by getting a new cpu slab */ > > [snip] > > > diff --git a/mm/slab.c b/mm/slab.c > > index 02786e1..2dba2d4 100644 > > --- a/mm/slab.c > > +++ b/mm/slab.c > > @@ -102,7 +102,6 @@ > > #include > > #include > > #include > > -#include > > #include > > #include > > #include > > diff --git a/mm/slub.c b/mm/slub.c > > index 26f0cb9..a61f1aa 100644 > > --- a/mm/slub.c > > +++ b/mm/slub.c > > @@ -17,7 +17,6 @@ > > #include > > #include > > #include > > -#include > > #include > > #include > > #include > > I'd suggest including 'trace/events/kmem.h' here as well. Though it most > likely gets the trace_kmem_* stuff through 'linux/slab.h'. > > Here's my ack if you need it: > > Acked-by: Eduard - Gabriel Munteanu Thanks, I'm queuing this patch, will add the forgotten Makefile change as well. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org