diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-20 10:42:04 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-14 10:49:48 -0500 |
| commit | 52223aa83d15975ed48d7c48b7c0cac494fb3228 (patch) | |
| tree | 0269509415cf0257087f251c0e2c7121598d2263 /mm | |
| parent | 79e5d20b72206c7ac60e0de14f9435adb0942fa6 (diff) | |
mm-slab-move-debug-out.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c index b76905ef21d2..1fd998310cc1 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3851,10 +3851,10 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp) { unsigned long flags; - local_irq_save(flags); debug_check_no_locks_freed(objp, obj_size(cachep)); if (!(cachep->flags & SLAB_DEBUG_OBJECTS)) debug_check_no_obj_freed(objp, obj_size(cachep)); + local_irq_save(flags); __cache_free(cachep, objp, __builtin_return_address(0)); local_irq_restore(flags); @@ -3880,11 +3880,11 @@ 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, obj_size(c)); debug_check_no_obj_freed(objp, obj_size(c)); + local_irq_save(flags); __cache_free(c, (void *)objp, __builtin_return_address(0)); local_irq_restore(flags); } |