summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-06-20 08:42:04 (GMT)
committerScott Wood <scottwood@freescale.com>2013-04-04 22:09:10 (GMT)
commit5d7da3af215636d0954ae8c96529108b58aa7a55 (patch)
tree302450c8a564eb39bff0e1fb2cdeef1ec2b8e396 /mm
parentaf6be1983ba3bf25069a8e6734fbcf855b727c9a (diff)
downloadlinux-fsl-qoriq-5d7da3af215636d0954ae8c96529108b58aa7a55.tar.xz
mm-slab-move-debug-out.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c
index e7667a3..2aa9fd4 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3895,10 +3895,10 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
if (!cachep)
return;
- local_irq_save(flags);
debug_check_no_locks_freed(objp, cachep->object_size);
if (!(cachep->flags & SLAB_DEBUG_OBJECTS))
debug_check_no_obj_freed(objp, cachep->object_size);
+ local_irq_save(flags);
__cache_free(cachep, objp, _RET_IP_);
local_irq_restore(flags);
@@ -3924,12 +3924,12 @@ void kfree(const void *objp)
if (unlikely(ZERO_OR_NULL_PTR(objp)))
return;
- local_irq_save(flags);
kfree_debugcheck(objp);
c = virt_to_cache(objp);
debug_check_no_locks_freed(objp, c->object_size);
debug_check_no_obj_freed(objp, c->object_size);
+ local_irq_save(flags);
__cache_free(c, (void *)objp, _RET_IP_);
local_irq_restore(flags);
}