From f1d7c59ffc29a35f477d67133c5e99797de0d342 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Thu, 26 Jul 2007 20:54:34 +0200
Subject: [PATCH] --- yaml --- r: 63189 b: refs/heads/master c:
 2208b764c14d0f1ad63da64b1a42db6077b6fe42 h: refs/heads/master i:   63187:
 53eda94367ac4d14a7ab7f94d07431a82794e95e v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 456e3e4e83e2..626fb55bd396 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02febdf7f62f2fbfa89ca9dc5d929beea89c96b1
+refs/heads/master: 2208b764c14d0f1ad63da64b1a42db6077b6fe42
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 221809f1c135..6c6d74ff0694 100644
--- a/trunk/mm/slub.c
+++ b/trunk/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);
 }