Index: linux-2.6.15-rc5-mm2/mm/vmscan.c
===================================================================
--- linux-2.6.15-rc5-mm2.orig/mm/vmscan.c	2005-12-14 17:45:06.000000000 -0800
+++ linux-2.6.15-rc5-mm2/mm/vmscan.c	2005-12-14 17:45:54.000000000 -0800
@@ -741,11 +741,11 @@ int migrate_page_remove_references(struc
 	 */
 	get_page(newpage);
 	newpage->index = page_index(page);
+	newpage->mapping = page->mapping;
 	if (PageSwapCache(page)) {
 		SetPageSwapCache(newpage);
 		set_page_private(newpage, page_private(page));
-	} else
-		newpage->mapping = page->mapping;
+	}
 
 	*radix_pointer = newpage;
 	__put_page(page);