diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 866d1ab1c6005818a100d0ef2d3d5ee83ab11c08..14a61a63350f5ccaabc8375e2114aa80687b9105 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -836,9 +836,17 @@ static int hwpoison_hugetlb_range(pte_t *ptep, unsigned long hmask,
 #define hwpoison_hugetlb_range	NULL
 #endif
 
+static int hwpoison_test_walk(unsigned long start, unsigned long end,
+			      struct mm_walk *walk)
+{
+	/* We also want to consider pages mapped into VM_PFNMAP. */
+	return 0;
+}
+
 static const struct mm_walk_ops hwpoison_walk_ops = {
 	.pmd_entry = hwpoison_pte_range,
 	.hugetlb_entry = hwpoison_hugetlb_range,
+	.test_walk = hwpoison_test_walk,
 	.walk_lock = PGWALK_RDLOCK,
 };