From: Ezequiel Garcia <elezegarcia@gmail.com>
To: kernel-janitors@vger.kernel.org, linux-mm@kvack.org
Cc: fengguang.wu@intel.com, Ezequiel Garcia <elezegarcia@gmail.com>,
Pekka Enberg <penberg@kernel.org>
Subject: [PATCH] mm/slab: Fix kmem_cache_alloc_node_trace() declaration
Date: Tue, 25 Sep 2012 08:07:09 -0300 [thread overview]
Message-ID: <1348571229-844-2-git-send-email-elezegarcia@gmail.com> (raw)
In-Reply-To: <1348571229-844-1-git-send-email-elezegarcia@gmail.com>
The bug was introduced in commit 4052147c0afa
"mm, slab: Match SLAB and SLUB kmem_cache_alloc_xxx_trace() prototype".
Cc: Pekka Enberg <penberg@kernel.org>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
---
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-09-25 11:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 11:07 [PATCH] mm/slab: Fix typo _RET_IP -> _RET_IP_ Ezequiel Garcia
2012-09-25 11:07 ` Ezequiel Garcia [this message]
2012-09-26 4:18 ` [PATCH] mm/slab: Fix kmem_cache_alloc_node_trace() declaration David Rientjes
2012-09-26 6:34 ` Dan Carpenter
2012-09-26 10:09 ` Ezequiel Garcia
2012-09-26 10:42 ` Pekka Enberg
2012-09-26 10:46 ` Ezequiel Garcia
2012-09-26 10:04 ` Ezequiel Garcia
2012-09-26 4:13 ` [PATCH] mm/slab: Fix typo _RET_IP -> _RET_IP_ David Rientjes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348571229-844-2-git-send-email-elezegarcia@gmail.com \
--to=elezegarcia@gmail.com \
--cc=fengguang.wu@intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=penberg@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).