Index: linux-2.6.17-rc1-mm2/mm/swap_state.c
===================================================================
--- linux-2.6.17-rc1-mm2.orig/mm/swap_state.c	2006-04-14 09:10:03.000000000 -0700
+++ linux-2.6.17-rc1-mm2/mm/swap_state.c	2006-04-14 12:55:04.000000000 -0700
@@ -306,13 +306,10 @@ struct page * lookup_swap_cache(swp_entr
 {
 	struct page *page;
 
-	if (is_migration_entry(entry)) {
-		page = migration_entry_to_page(entry);
-		get_page(page);
-		return page;
-	}
-
-	page = find_get_page(&swapper_space, entry.val);
+	if (is_migration_entry(entry))
+		page = find_get_migration_page(entry);
+	else
+		page = find_get_page(&swapper_space, entry.val);
 
 	if (page)
 		INC_CACHE_INFO(find_success);