aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2007-07-26 14:54:34 -0400
committerChristoph Lameter <clameter@sgi.com>2007-07-30 15:15:15 -0400
commit2208b764c14d0f1ad63da64b1a42db6077b6fe42 (patch)
treeeb936f9fce478ffd6252e5dd2e6a88540b78a641 /mm
parent02febdf7f62f2fbfa89ca9dc5d929beea89c96b1 (diff)
slub: fix bug in slub debug support
We ClearSlabDebug() before the last SlabDebug() check. Clear it later. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Christoph Lameter <clameter@sgi.com>
Diffstat (limited to 'mm')
-rw-r--r--mm/slub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 221809f1c135..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)
1131 slab_pad_check(s, page); 1131 slab_pad_check(s, page);
1132 for_each_object(p, s, page_address(page)) 1132 for_each_object(p, s, page_address(page))
1133 check_object(s, page, p, 0); 1133 check_object(s, page, p, 0);
1134 ClearSlabDebug(page);
1134 } 1135 }
1135 1136
1136 mod_zone_page_state(page_zone(page), 1137 mod_zone_page_state(page_zone(page),
@@ -1169,7 +1170,6 @@ static void discard_slab(struct kmem_cache *s, struct page *page)
1169 1170
1170 atomic_long_dec(&n->nr_slabs); 1171 atomic_long_dec(&n->nr_slabs);
1171 reset_page_mapcount(page); 1172 reset_page_mapcount(page);
1172 ClearSlabDebug(page);
1173 __ClearPageSlab(page); 1173 __ClearPageSlab(page);
1174 free_slab(s, page); 1174 free_slab(s, page);
1175} 1175}