diff --git a/[refs] b/[refs]
index d270e6eb9c9f..e91564b0741a 100644
--- 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
index e4a5c912983d..666e4e677414 100644
--- 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);
 	}