---

yaml --- r: 253713 b: refs/heads/master c: 99a15e2 h: refs/heads/master i: 253711: 4534dd9 v: v3
git-mirror · Jun 16, 2011 · b8a955e · b8a955e
1 parent 1957adc
commit b8a955e
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: 7cc2ed05891f424c2e323bc1a368ddb5c78b90f2
+refs/heads/master: 99a15e21d96f6857dafab1e5167e5e8183215c9c
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
@@ -288,7 +288,7 @@ static int migrate_page_move_mapping(struct address_space *mapping,
 	 */
 	__dec_zone_page_state(page, NR_FILE_PAGES);
 	__inc_zone_page_state(newpage, NR_FILE_PAGES);
-	if (PageSwapBacked(page)) {
+	if (!PageSwapCache(page) && PageSwapBacked(page)) {
 		__dec_zone_page_state(page, NR_SHMEM);
 		__inc_zone_page_state(newpage, NR_SHMEM);
 	}