From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx112.postini.com [74.125.245.112]) by kanga.kvack.org (Postfix) with SMTP id 015E56B0062 for ; Tue, 25 Sep 2012 07:07:27 -0400 (EDT) Received: by mail-gh0-f169.google.com with SMTP id r1so2172314ghr.14 for ; Tue, 25 Sep 2012 04:07:27 -0700 (PDT) From: Ezequiel Garcia Subject: [PATCH] mm/slab: Fix kmem_cache_alloc_node_trace() declaration Date: Tue, 25 Sep 2012 08:07:09 -0300 Message-Id: <1348571229-844-2-git-send-email-elezegarcia@gmail.com> In-Reply-To: <1348571229-844-1-git-send-email-elezegarcia@gmail.com> References: <1348571229-844-1-git-send-email-elezegarcia@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: kernel-janitors@vger.kernel.org, linux-mm@kvack.org Cc: fengguang.wu@intel.com, Ezequiel Garcia , Pekka Enberg The bug was introduced in commit 4052147c0afa "mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype". Cc: Pekka Enberg Reported-by: Fengguang Wu Signed-off-by: Ezequiel Garcia --- mm/slab.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/slab.c b/mm/slab.c index ca3849f..3409ead 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3862,10 +3862,10 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid) EXPORT_SYMBOL(kmem_cache_alloc_node); #ifdef CONFIG_TRACING -void *kmem_cache_alloc_node_trace(struct kmem_cache *cachep, +void *kmem_cache_alloc_node_trace(size_t size, + struct kmem_cache *cachep, gfp_t flags, - int nodeid, - size_t size) + int nodeid) { void *ret; @@ -3887,7 +3887,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller) cachep = kmem_find_general_cachep(size, flags); if (unlikely(ZERO_OR_NULL_PTR(cachep))) return cachep; - return kmem_cache_alloc_node_trace(cachep, flags, node, size); + return kmem_cache_alloc_node_trace(size, cachep, flags, node); } #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING) -- 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