Messages in this thread Patch in this message | | | From | Zheng Bin <> | Subject | [PATCH -next] 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.
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
| |