1 files changed, 3 insertions, 3 deletions

diff --git a/mm/page_io.c b/mm/page_io.c
index cd52b9cc169b..e93f1a4cacd7 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -347,7 +347,7 @@ out:
         return ret;
 }
 
-int swap_readpage(struct page *page, bool do_poll)
+int swap_readpage(struct page *page, bool synchronous)
 {
         struct bio *bio;
         int ret = 0;
@@ -355,7 +355,7 @@ int swap_readpage(struct page *page, bool do_poll)
         blk_qc_t qc;
         struct gendisk *disk;
 
-        VM_BUG_ON_PAGE(!PageSwapCache(page), page);
+        VM_BUG_ON_PAGE(!PageSwapCache(page) && !synchronous, page);
         VM_BUG_ON_PAGE(!PageLocked(page), page);
         VM_BUG_ON_PAGE(PageUptodate(page), page);
         if (frontswap_load(page) == 0) {
@@ -403,7 +403,7 @@ int swap_readpage(struct page *page, bool do_poll)
         count_vm_event(PSWPIN);
         bio_get(bio);
         qc = submit_bio(bio);
-        while (do_poll) {
+        while (synchronous) {
                 set_current_state(TASK_UNINTERRUPTIBLE);
                 if (!READ_ONCE(bio->bi_private))
                         break;