From 1f22e3a7e895d30119d6825459b3d5922f7beff0 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Fri, 23 Jun 2006 02:03:04 -0700
Subject: [PATCH] --- yaml --- r: 28894 b: refs/heads/master c:
 4da5eda0dca9730f59f391230304526ab4bffec7 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d17010a5b2fc..59eb78f1206f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb2b95e1c6b56e3d2369d3a5f4bc97f4fa180683
+refs/heads/master: 4da5eda0dca9730f59f391230304526ab4bffec7
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 0ec7bc644271..7e3683fd4f3c 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -1879,7 +1879,6 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		goto out;
 
 	entry = pte_to_swp_entry(orig_pte);
-again:
 	page = lookup_swap_cache(entry);
 	if (!page) {
  		swapin_readahead(entry, address, vma);
@@ -1903,12 +1902,6 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
 	mark_page_accessed(page);
 	lock_page(page);
-	if (!PageSwapCache(page)) {
-		/* Page migration has occured */
-		unlock_page(page);
-		page_cache_release(page);
-		goto again;
-	}
 
 	/*
 	 * Back out if somebody else already faulted in this pte.