[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <3e3691cc-c29e-78be-eeff-56ecb6753182@huawei.com>
Date: Wed, 29 Jun 2022 10:56:00 +0800
From: Miaohe Lin <linmiaohe@...wei.com>
To: Zheng Bin <zhengbin13@...wei.com>, <naoya.horiguchi@....com>,
<akpm@...ux-foundation.org>
CC: <gaochao49@...wei.com>, <linux-mm@...ck.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: [PATCH -next] mm/memory-failure: fix redefinition of
mf_generic_kill_procs
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@...wei.com>
Thanks for fixing this. mf_generic_kill_procs shouldn't depend on CONFIG_HUGETLB_PAGE.
Reviewed-by: Miaohe Lin <linmiaohe@...wei.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
>
> .
>
Powered by blists - more mailing lists