summaryrefslogtreecommitdiffstats
path: root/mm/memory-failure.c
diff options
context:
space:
mode:
authorNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>2017-07-11 00:47:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-11 01:32:30 +0200
commitddd40d8a2c4ef8f2152ea6d227e11475cf7e5bfa (patch)
tree922caf132b05c7f93a6133a70552aa013daebb2c /mm/memory-failure.c
parentmm: hwpoison: dissolve in-use hugepage in unrecoverable memory error (diff)
downloadlinux-ddd40d8a2c4ef8f2152ea6d227e11475cf7e5bfa.tar.xz
linux-ddd40d8a2c4ef8f2152ea6d227e11475cf7e5bfa.zip
mm: hugetlb: delete dequeue_hwpoisoned_huge_page()
dequeue_hwpoisoned_huge_page() is no longer used, so let's remove it. Link: http://lkml.kernel.org/r/1496305019-5493-9-git-send-email-n-horiguchi@ah.jp.nec.com Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory-failure.c')
-rw-r--r--mm/memory-failure.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 6f8f69f4a986..2aec57c07652 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1458,17 +1458,6 @@ int unpoison_memory(unsigned long pfn)
}
if (!get_hwpoison_page(p)) {
- /*
- * Since HWPoisoned hugepage should have non-zero refcount,
- * race between memory failure and unpoison seems to happen.
- * In such case unpoison fails and memory failure runs
- * to the end.
- */
- if (PageHuge(page)) {
- unpoison_pr_info("Unpoison: Memory failure is now running on free hugepage %#lx\n",
- pfn, &unpoison_rs);
- return 0;
- }
if (TestClearPageHWPoison(p))
num_poisoned_pages_dec();
unpoison_pr_info("Unpoison: Software-unpoisoned free page %#lx\n",