* [PATCH -next] mm/memory-failure: fix redefinition of mf_generic_kill_procs
@ 2022-06-28 11:21 Zheng Bin
2022-06-29 2:56 ` Miaohe Lin
0 siblings, 1 reply; 2+ messages in thread
From: Zheng Bin @ 2022-06-28 11:21 UTC (permalink / raw)
To: naoya.horiguchi, linmiaohe, akpm, linux-mm, linux-kernel
Cc: zhengbin13, gaochao49
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.
Fixes: 4184e8d7d056 ("mm-factor-helpers-for-memory_failure_dev_pagemap-fix")
Signed-off-by: Zheng Bin <zhengbin13@huawei.com>
---
mm/memory-failure.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 001fead45f30..c9931c676335 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1801,13 +1801,6 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
}
#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;
--
2.31.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH -next] mm/memory-failure: fix redefinition of mf_generic_kill_procs
2022-06-28 11:21 [PATCH -next] mm/memory-failure: fix redefinition of mf_generic_kill_procs Zheng Bin
@ 2022-06-29 2:56 ` Miaohe Lin
0 siblings, 0 replies; 2+ messages in thread
From: Miaohe Lin @ 2022-06-29 2:56 UTC (permalink / raw)
To: Zheng Bin, naoya.horiguchi, akpm; +Cc: gaochao49, linux-mm, linux-kernel
On 2022/6/28 19:21, Zheng Bin wrote:
> 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.
>
> Fixes: 4184e8d7d056 ("mm-factor-helpers-for-memory_failure_dev_pagemap-fix")
> Signed-off-by: Zheng Bin <zhengbin13@huawei.com>
Thanks for fixing this. mf_generic_kill_procs shouldn't depend on CONFIG_HUGETLB_PAGE.
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
BTW: It seems there is a mess between CONFIG_HUGETLB_PAGE and CONFIG_FS_DAX. It's better
to fix it later.
> ---
> mm/memory-failure.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index 001fead45f30..c9931c676335 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -1801,13 +1801,6 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
> }
>
> #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;
> --
> 2.31.1
>
> .
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-29 2:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-28 11:21 [PATCH -next] mm/memory-failure: fix redefinition of mf_generic_kill_procs Zheng Bin
2022-06-29 2:56 ` Miaohe Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox