diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memory.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mm/memory.c b/mm/memory.c index 0ec7bc644271..7e3683fd4f3c 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -1879,7 +1879,6 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
1879 | goto out; | 1879 | goto out; |
1880 | 1880 | ||
1881 | entry = pte_to_swp_entry(orig_pte); | 1881 | entry = pte_to_swp_entry(orig_pte); |
1882 | again: | ||
1883 | page = lookup_swap_cache(entry); | 1882 | page = lookup_swap_cache(entry); |
1884 | if (!page) { | 1883 | if (!page) { |
1885 | swapin_readahead(entry, address, vma); | 1884 | swapin_readahead(entry, address, vma); |
@@ -1903,12 +1902,6 @@ again: | |||
1903 | 1902 | ||
1904 | mark_page_accessed(page); | 1903 | mark_page_accessed(page); |
1905 | lock_page(page); | 1904 | lock_page(page); |
1906 | if (!PageSwapCache(page)) { | ||
1907 | /* Page migration has occured */ | ||
1908 | unlock_page(page); | ||
1909 | page_cache_release(page); | ||
1910 | goto again; | ||
1911 | } | ||
1912 | 1905 | ||
1913 | /* | 1906 | /* |
1914 | * Back out if somebody else already faulted in this pte. | 1907 | * Back out if somebody else already faulted in this pte. |