diff options
author | Feng Tang <feng.tang@intel.com> | 2012-07-02 02:29:10 -0400 |
---|---|---|
committer | Pekka Enberg <penberg@kernel.org> | 2012-07-02 06:45:52 -0400 |
commit | d97d476b1bb11e24268a6bac8214f9bc58716b45 (patch) | |
tree | 01a1a0ade6fb5ddcbe6b2bfc45797d5dcf0ae52f /mm/slab.c | |
parent | 0672aa7c236ada6c636e68b2ac2aa135169e6e18 (diff) |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3890,7 +3890,7 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp) | |||
3890 | unsigned long flags; | 3890 | unsigned long flags; |
3891 | 3891 | ||
3892 | local_irq_save(flags); | 3892 | local_irq_save(flags); |
3893 | debug_check_no_locks_freed(objp, cachep->size); | 3893 | debug_check_no_locks_freed(objp, cachep->object_size); |
3894 | if (!(cachep->flags & SLAB_DEBUG_OBJECTS)) | 3894 | if (!(cachep->flags & SLAB_DEBUG_OBJECTS)) |
3895 | debug_check_no_obj_freed(objp, cachep->object_size); | 3895 | debug_check_no_obj_freed(objp, cachep->object_size); |
3896 | __cache_free(cachep, objp, __builtin_return_address(0)); | 3896 | __cache_free(cachep, objp, __builtin_return_address(0)); |