---

yaml --- r: 88400 b: refs/heads/master c: 49bd522 h: refs/heads/master v: v3
git-mirror · Apr 14, 2008 · 4f7c525 · 4f7c525
1 parent 354f1d4
commit 4f7c525
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50ef37b96c11e76625067ae413dc54585ea22585
+refs/heads/master: 49bd5221ce8fb55d12c04a3ffd375201c5bbfb7a
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -1125,6 +1125,8 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
 		NR_SLAB_RECLAIMABLE : NR_SLAB_UNRECLAIMABLE,
 		-pages);
 
+	__ClearPageSlab(page);
+	reset_page_mapcount(page);
 	__free_pages(page, s->order);
 }
 
@@ -1154,8 +1156,6 @@ static void discard_slab(struct kmem_cache *s, struct page *page)
 	struct kmem_cache_node *n = get_node(s, page_to_nid(page));
 
 	atomic_long_dec(&n->nr_slabs);
-	reset_page_mapcount(page);
-	__ClearPageSlab(page);
 	free_slab(s, page);
 }