summaryrefslogtreecommitdiff
path: root/mm/slab.c
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2012-07-02 14:29:10 +0800
committerPekka Enberg <penberg@kernel.org>2012-07-02 13:45:52 +0300
commitd97d476b1bb11e24268a6bac8214f9bc58716b45 (patch)
tree01a1a0ade6fb5ddcbe6b2bfc45797d5dcf0ae52f /mm/slab.c
parent0672aa7c236ada6c636e68b2ac2aa135169e6e18 (diff)
downloadlwn-d97d476b1bb11e24268a6bac8214f9bc58716b45.tar.gz
lwn-d97d476b1bb11e24268a6bac8214f9bc58716b45.zip
slab: Fix a typo in commit 8c138b "slab: Get rid of obj_size macro"
Commit 8c138b only sits in Pekka's and linux-next tree now, which tries to replace obj_size(cachep) with cachep->object_size, but has a typo in kmem_cache_free() by using "size" instead of "object_size", which casues some regressions. Reported-and-tested-by: Fengguang Wu <wfg@linux.intel.com> Signed-off-by: Feng Tang <feng.tang@intel.com> Cc: Christoph Lameter <cl@linux.com> Acked-by: Glauber Costa <glommer@parallels.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm/slab.c')
-rw-r--r--mm/slab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c
index d95ad4c37f64..8b7cb802a754 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3890,7 +3890,7 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
unsigned long flags;
local_irq_save(flags);
- debug_check_no_locks_freed(objp, cachep->size);
+ debug_check_no_locks_freed(objp, cachep->object_size);
if (!(cachep->flags & SLAB_DEBUG_OBJECTS))
debug_check_no_obj_freed(objp, cachep->object_size);
__cache_free(cachep, objp, __builtin_return_address(0));