X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fswapfile.c;h=7ff0a81c7b016fc6957288c342eebdd697d020dc;hb=6300ea75031e7aebfe3331245b7f750d82621223;hp=a2d9bb4e80df7e3f977b07df8223584c78aba31a;hpb=e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7;p=karo-tx-linux.git

diff --git a/mm/swapfile.c b/mm/swapfile.c
index a2d9bb4e80df..7ff0a81c7b01 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -885,7 +885,7 @@ static int try_to_unuse(unsigned int type)
 		/*
 		 * So we could skip searching mms once swap count went
 		 * to 1, we did not mark any present ptes as dirty: must
-		 * mark page dirty so shrink_list will preserve it.
+		 * mark page dirty so shrink_page_list will preserve it.
 		 */
 		SetPageDirty(page);
 		unlock_page(page);
@@ -1531,9 +1531,6 @@ asmlinkage long sys_swapon(const char __user * specialfile, int swap_flags)
 		error = PTR_ERR(page);
 		goto bad_swap;
 	}
-	wait_on_page_locked(page);
-	if (!PageUptodate(page))
-		goto bad_swap;
 	kmap(page);
 	swap_header = page_address(page);