The quilt patch titled
Subject: mm-factor-helpers-for-memory_failure_dev_pagemap-fix
has been removed from the -mm tree. Its filename was
mm-factor-helpers-for-memory_failure_dev_pagemap-fix.patch
This patch was dropped because it was folded into mm-factor-helpers-for-memory_failure_dev_pagemap.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-factor-helpers-for-memory_failure_dev_pagemap-fix
Date: Sat Jun 4 11:31:06 AM PDT 2022
fix CONFIG_HUGETLB_PAGE=n build
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Cc: Shiyang Ruan <ruansy.fnst@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory-failure.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- a/mm/memory-failure.c~mm-factor-helpers-for-memory_failure_dev_pagemap-fix
+++ a/mm/memory-failure.c
@@ -1723,12 +1723,21 @@ out:
unlock_page(head);
return res;
}
+
#else
+
+static inline int mf_generic_kill_procs(unsigned long long pfn, int flags,
+ struct dev_pagemap *pgmap)
+{
+ return 0;
+}
+
static inline int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb)
{
return 0;
}
-#endif
+
+#endif /* CONFIG_HUGETLB_PAGE */
static int memory_failure_dev_pagemap(unsigned long pfn, int flags,
struct dev_pagemap *pgmap)
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-factor-helpers-for-memory_failure_dev_pagemap.patch
xfs-support-cow-in-fsdax-mode-fix.patch
mm-thp-kill-transparent_hugepage_active-fix.patch
mm-thp-kill-transparent_hugepage_active-fix-fix.patch
mm-page_alloc-protect-pcp-lists-with-a-spinlock-fix.patch
android-binder-stop-saving-a-pointer-to-the-vma-fix.patch
mm-drop-oom-code-from-exit_mmap-fix-fix.patch
mm-add-merging-after-mremap-resize-checkpatch-fixes.patch
