From: Andrew Morton <akpm@linux-foundation.org>
Date: Sat, 4 Jun 2022 18:31:06 +0000 (-0700)
Subject: mm-factor-helpers-for-memory_failure_dev_pagemap-fix
X-Git-Tag: maple_v12_fixes~138
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4d5dd752e64db1ed3834036c883c80b9f07be0c8;p=users%2Fjedix%2Flinux-maple.git

mm-factor-helpers-for-memory_failure_dev_pagemap-fix

fix CONFIG_HUGETLB_PAGE=n build

Reported-by: kernel test robot <lkp@intel.com>
Cc: Shiyang Ruan <ruansy.fnst@fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 639fb551bdaf..aa821ba1095c 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1716,12 +1716,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)