---

yaml --- r: 180059 b: refs/heads/master c: a701623 h: refs/heads/master i: 180057: fc4c5f0 180055: e7d6111 v: v3
git-mirror · Jan 29, 2010 · b8a7d34 · b8a7d34
1 parent b4a4f30
commit b8a7d34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67f15b06c1a7e5417b7042b515ca2695de30beda
+refs/heads/master: a7016235a61d520e6806f38129001d935c4b6661
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
@@ -556,8 +556,9 @@ static void free_pcppages_bulk(struct zone *zone, int count,
 			page = list_entry(list->prev, struct page, lru);
 			/* must delete as __free_one_page list manipulates */
 			list_del(&page->lru);
-			__free_one_page(page, zone, 0, migratetype);
-			trace_mm_page_pcpu_drain(page, 0, migratetype);
+			/* MIGRATE_MOVABLE list may include MIGRATE_RESERVEs */
+			__free_one_page(page, zone, 0, page_private(page));
+			trace_mm_page_pcpu_drain(page, 0, page_private(page));
 		} while (--count && --batch_free && !list_empty(list));
 	}
 	spin_unlock(&zone->lock);