From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx103.postini.com [74.125.245.103]) by kanga.kvack.org (Postfix) with SMTP id BECD66B002B for ; Tue, 25 Sep 2012 15:55:56 -0400 (EDT) Received: by ied10 with SMTP id 10so18623680ied.14 for ; Tue, 25 Sep 2012 12:55:56 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <1347137279-17568-1-git-send-email-elezegarcia@gmail.com> <1347137279-17568-4-git-send-email-elezegarcia@gmail.com> Date: Tue, 25 Sep 2012 16:55:55 -0300 Message-ID: Subject: Re: [patch slab/next] mm, slob: fix build breakage in __kmalloc_node_track_caller From: Ezequiel Garcia Content-Type: text/plain; charset=ISO-8859-1 Sender: owner-linux-mm@kvack.org List-ID: To: David Rientjes Cc: Pekka Enberg , linux-kernel@vger.kernel.org, linux-mm@kvack.org On Tue, Sep 25, 2012 at 4:53 PM, David Rientjes wrote: > On Sat, 8 Sep 2012, Ezequiel Garcia wrote: > >> @@ -454,15 +455,35 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node) >> gfp |= __GFP_COMP; >> ret = slob_new_pages(gfp, order, node); >> >> - trace_kmalloc_node(_RET_IP_, ret, >> + trace_kmalloc_node(caller, ret, >> size, PAGE_SIZE << order, gfp, node); >> } >> >> kmemleak_alloc(ret, size, 1, gfp); >> return ret; >> } >> + >> +void *__kmalloc_node(size_t size, gfp_t gfp, int node) >> +{ >> + return __do_kmalloc_node(size, gfp, node, _RET_IP_); >> +} >> EXPORT_SYMBOL(__kmalloc_node); >> >> +#ifdef CONFIG_TRACING >> +void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller) >> +{ >> + return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, caller); >> +} >> + >> +#ifdef CONFIG_NUMA >> +void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, >> + int node, unsigned long caller) >> +{ >> + return __do_kmalloc_node(size, gfp, node, caller); >> +} >> +#endif > > This breaks Pekka's slab/next tree with this: > > mm/slob.c: In function '__kmalloc_node_track_caller': > mm/slob.c:488: error: 'gfp' undeclared (first use in this function) > mm/slob.c:488: error: (Each undeclared identifier is reported only once > mm/slob.c:488: error: for each function it appears in.) > > > mm, slob: fix build breakage in __kmalloc_node_track_caller > > "mm, slob: Add support for kmalloc_track_caller()" breaks the build > because gfp is undeclared. Fix it. > > Signed-off-by: David Rientjes > --- > mm/slob.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/mm/slob.c b/mm/slob.c > --- a/mm/slob.c > +++ b/mm/slob.c > @@ -482,7 +482,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller) > } > > #ifdef CONFIG_NUMA > -void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, > +void *__kmalloc_node_track_caller(size_t size, gfp_t gfp, > int node, unsigned long caller) > { > return __do_kmalloc_node(size, gfp, node, caller); Acked-by: Ezequiel Garcia Thanks, Ezequiel. -- 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