From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx175.postini.com [74.125.245.175]) by kanga.kvack.org (Postfix) with SMTP id C2CAF6B002B for ; Wed, 26 Sep 2012 08:21:40 -0400 (EDT) Received: by ggnf4 with SMTP id f4so121280ggn.14 for ; Wed, 26 Sep 2012 05:21:39 -0700 (PDT) From: Ezequiel Garcia Subject: [PATCH v2] mm/slab: Fix kmem_cache_alloc_node_trace() declaration Date: Wed, 26 Sep 2012 09:21:33 -0300 Message-Id: <1348662093-3116-1-git-send-email-elezegarcia@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: linux-mm@kvack.org Cc: kernel-janitors@vger.kernel.org, fengguang.wu@intel.com, Ezequiel Garcia , Pekka Enberg , David Rientjes This bug was introduced in commit "mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype". Cc: Pekka Enberg Cc: David Rientjes Reported-by: Fengguang Wu Signed-off-by: Ezequiel Garcia --- Changes from v1: * Fix kmem_cache_alloc_node_trace to effectively match SLUB's include/linux/slab_def.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index e98caeb..cc290f0 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h @@ -159,16 +159,16 @@ extern void *__kmalloc_node(size_t size, gfp_t flags, int node); extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node); #ifdef CONFIG_TRACING -extern void *kmem_cache_alloc_node_trace(size_t size, - struct kmem_cache *cachep, +extern void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep, gfp_t flags, - int nodeid); + int nodeid, + size_t size); #else static __always_inline void * -kmem_cache_alloc_node_trace(size_t size, - struct kmem_cache *cachep, +kmem_cache_alloc_node_trace(struct kmem_cache *cachep, gfp_t flags, - int nodeid) + int nodeid, + size_t size) { return kmem_cache_alloc_node(cachep, flags, nodeid); } @@ -200,7 +200,7 @@ found: #endif cachep = malloc_sizes[i].cs_cachep; - return kmem_cache_alloc_node_trace(size, cachep, flags, node); + return kmem_cache_alloc_node_trace(cachep, flags, node, size); } return __kmalloc_node(size, flags, node); } -- 1.7.8.6 -- 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