1 files changed, 4 insertions, 4 deletions

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index e0af336530c6..37feb9fec228 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -945,7 +945,7 @@ static int hwpoison_user_mappings(struct page *p, unsigned long pfn,
                 collect_procs(ppage, &tokill);
 
         if (hpage != ppage)
-                lock_page_nosync(ppage);
+                lock_page(ppage);
 
         ret = try_to_unmap(ppage, ttu);
         if (ret != SWAP_SUCCESS)
@@ -1038,7 +1038,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
                          * Check "just unpoisoned", "filter hit", and
                          * "race with other subpage."
                          */
-                        lock_page_nosync(hpage);
+                        lock_page(hpage);
                         if (!PageHWPoison(hpage)
                             || (hwpoison_filter(p) && TestClearPageHWPoison(p))
                             || (p != hpage && TestSetPageHWPoison(hpage))) {
@@ -1088,7 +1088,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
          * It's very difficult to mess with pages currently under IO
          * and in many cases impossible, so we just avoid it here.
          */
-        lock_page_nosync(hpage);
+        lock_page(hpage);
 
         /*
          * unpoison always clear PG_hwpoison inside page lock
@@ -1231,7 +1231,7 @@ int unpoison_memory(unsigned long pfn)
                 return 0;
         }
 
-        lock_page_nosync(page);
+        lock_page(page);
         /*
          * This test is racy because PG_hwpoison is set outside of page lock.
          * That's acceptable because that won't trigger kernel panic. Instead,