summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-30 12:39:15 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-30 12:39:15 -0700
commit970e2dfa672b5b26967b0983e24b8d92f972c907 (patch)
tree48ca21427d8c9c87a574ccd8dd7350a00419fa93
parent3a3485be68c3b44dd7e3790472976fdc2467bb40 (diff)
parent2208b764c14d0f1ad63da64b1a42db6077b6fe42 (diff)
Merge branch 'to-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/slab
* 'to-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/slab: slub: fix bug in slub debug support slub: add lock debugging check
-rw-r--r--mm/slub.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 9b2d6178d06c..6c6d74ff0694 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1131,6 +1131,7 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
slab_pad_check(s, page);
for_each_object(p, s, page_address(page))
check_object(s, page, p, 0);
+ ClearSlabDebug(page);
}
mod_zone_page_state(page_zone(page),
@@ -1169,7 +1170,6 @@ static void discard_slab(struct kmem_cache *s, struct page *page)
atomic_long_dec(&n->nr_slabs);
reset_page_mapcount(page);
- ClearSlabDebug(page);
__ClearPageSlab(page);
free_slab(s, page);
}
@@ -1656,6 +1656,7 @@ static void __always_inline slab_free(struct kmem_cache *s,
unsigned long flags;
local_irq_save(flags);
+ debug_check_no_locks_freed(object, s->objsize);
if (likely(page == s->cpu_slab[smp_processor_id()] &&
!SlabDebug(page))) {
object[page->offset] = page->lockless_freelist;