io_uring: reinstate the inflight tracking

[linux-2.6-microblaze.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 27760c1..d4a4adc 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1274,7 +1274,7 @@ try_again:
        }
 out:
        if (ret == -EIO)
-               dump_page(p, "hwpoison: unhandlable page");
+               pr_err("Memory failure: %#lx: unhandlable page.\n", page_to_pfn(p));
 
        return ret;
 }
@@ -1860,19 +1860,6 @@ try_again:
        }
 
        if (PageTransHuge(hpage)) {
-               /*
-                * Bail out before SetPageHasHWPoisoned() if hpage is
-                * huge_zero_page, although PG_has_hwpoisoned is not
-                * checked in set_huge_zero_page().
-                *
-                * TODO: Handle memory failure of huge_zero_page thoroughly.
-                */
-               if (is_huge_zero_page(hpage)) {
-                       action_result(pfn, MF_MSG_UNSPLIT_THP, MF_IGNORED);
-                       res = -EBUSY;
-                       goto unlock_mutex;
-               }
-
                /*
                 * The flag must be set after the refcount is bumped
                 * otherwise it may race with THP split.