1 files changed, 8 insertions, 8 deletions

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 99ccb4472623..2b9a5eef39e0 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -208,7 +208,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
          * Don't use force here, it's convenient if the signal
          * can be temporarily blocked.
          * This could cause a loop when the user sets SIGBUS
-         * to SIG_IGN, but hopefully noone will do that?
+         * to SIG_IGN, but hopefully no one will do that?
          */
         ret = send_sig_info(SIGBUS, &si, t);  /* synchronous? */
         if (ret < 0)
@@ -634,7 +634,7 @@ static int me_pagecache_dirty(struct page *p, unsigned long pfn)
                  * when the page is reread or dropped.  If an
                  * application assumes it will always get error on
                  * fsync, but does other operations on the fd before
-                 * and the page is dropped inbetween then the error
+                 * and the page is dropped between then the error
                  * will not be properly reported.
                  *
                  * This can already happen even without hwpoisoned
@@ -728,7 +728,7 @@ static int me_huge_page(struct page *p, unsigned long pfn)
  * The table matches them in order and calls the right handler.
  *
  * This is quite tricky because we can access page at any time
- * in its live cycle, so all accesses have to be extremly careful.
+ * in its live cycle, so all accesses have to be extremely careful.
  *
  * This is not complete. More states could be added.
  * For any missing state don't attempt recovery.
@@ -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
@@ -1130,7 +1130,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
 
         /*
          * Now take care of user space mappings.
-         * Abort on fail: __remove_from_page_cache() assumes unmapped page.
+         * Abort on fail: __delete_from_page_cache() assumes unmapped page.
          */
         if (hwpoison_user_mappings(p, pfn, trapno) != SWAP_SUCCESS) {
                 printk(KERN_ERR "MCE %#lx: cannot unmap page, give up\n", pfn);
@@ -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,