Merge branch 'linux-2.6'

1 files changed, 0 insertions, 3 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index a2d9bb4e80df..acc172cbe3aa 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -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);