The patch titled
Subject: mm/memory-failure: fix redefinition of mf_generic_kill_procs
has been added to the -mm mm-unstable branch. Its filename is
mm-factor-helpers-for-memory_failure_dev_pagemap-fix-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-factor-helpers-for-memory_failure_dev_pagemap-fix-fix.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Zheng Bin <zhengbin13@xxxxxxxxxx>
Subject: mm/memory-failure: fix redefinition of mf_generic_kill_procs
Date: Tue, 28 Jun 2022 19:21:43 +0800
If CONFIG_HUGETLB_PAGE=n, building fails:
mm/memory-failure.c:1805:19: error: redefinition of `mf_generic_kill_procs'
static inline int mf_generic_kill_procs(unsigned long long pfn, int flags,
^~~~~~~~~~~~~~~~~~~~~
mm/memory-failure.c:1564:12: note: previous definition of `mf_generic_kill_procs' was here
static int mf_generic_kill_procs(unsigned long long pfn, int flags,
This patch fixes that.
Link: https://lkml.kernel.org/r/20220628112143.1170473-1-zhengbin13@xxxxxxxxxx
Fixes: 4184e8d7d056 ("mm-factor-helpers-for-memory_failure_dev_pagemap-fix")
Signed-off-by: Zheng Bin <zhengbin13@xxxxxxxxxx>
Cc: Shiyang Ruan <ruansy.fnst@xxxxxxxxxxx>
Cc: Naoya Horiguchi <naoya.horiguchi@xxxxxxx>
Cc: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Cc: gaochao <gaochao49@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory-failure.c | 7 -------
1 file changed, 7 deletions(-)
--- a/mm/memory-failure.c~mm-factor-helpers-for-memory_failure_dev_pagemap-fix-fix
+++ a/mm/memory-failure.c
@@ -1724,13 +1724,6 @@ out:
}
#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;
_
Patches currently in -mm which might be from zhengbin13@xxxxxxxxxx are
mm-factor-helpers-for-memory_failure_dev_pagemap-fix-fix.patch
