---

yaml --- r: 186197 b: refs/heads/master c: f650316 h: refs/heads/master i: 186195: 72905dd v: v3
git-mirror · Mar 6, 2010 · ec3efb5 · ec3efb5
1 parent 2d13a38
commit ec3efb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76ca542d880ebe59a7a03c1597e73e1ded271857
+refs/heads/master: f650316c8b80fe61a31b8b575405b37cbf170459
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -583,6 +583,7 @@ static void __free_pages_ok(struct page *page, unsigned int order)
 	int bad = 0;
 	int wasMlocked = __TestClearPageMlocked(page);
 
+	trace_mm_page_free_direct(page, order);
 	kmemcheck_free_shadow(page, order);
 
 	for (i = 0 ; i < (1 << order) ; ++i)
@@ -2008,7 +2009,6 @@ void __pagevec_free(struct pagevec *pvec)
 void __free_pages(struct page *page, unsigned int order)
 {
 	if (put_page_testzero(page)) {
-		trace_mm_page_free_direct(page, order);
 		if (order == 0)
 			free_hot_page(page);
 		else