Re: linux-next: build failure after merge of the mm tree

[Baolin Wang]

On 5/12/2022 5:38 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the mm tree, today's linux-next build (arm64 defconfig)
> failed like this:
>
> arch/arm64/mm/hugetlbpage.c: In function 'huge_ptep_clear_flush':
> arch/arm64/mm/hugetlbpage.c:493:16: error: implicit declaration of function 'get_clear_flush'; did you mean 'ptep_clear_flush'? [-Werror=implicit-function-declaration]
>    493 |         return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncontig);
>        |                ^~~~~~~~~~~~~~~
>        |                ptep_clear_flush
> arch/arm64/mm/hugetlbpage.c:493:16: error: incompatible types when returning type 'int' but 'pte_t' was expected
>    493 |         return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncontig);
>        |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> arch/arm64/mm/hugetlbpage.c:494:1: error: control reaches end of non-void function [-Werror=return-type]
>    494 | }
>        | ^
>
> Caused by commit
>
>    00df1f1a133b ("mm: change huge_ptep_clear_flush() to return the original pte")
>
> interacting with commit
>
>    fb396bb459c1 ("arm64/hugetlb: Drop TLB flush from get_clear_flush()")
>
> I have applied the following merg fix patch for today.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Thu, 12 May 2022 19:33:11 +1000
> Subject: [PATCH] fixup for "mm: change huge_ptep_clear_flush() to return the original pte"
>
> It interacts with commit
>
>    fb396bb459c1 ("arm64/hugetlb: Drop TLB flush from get_clear_flush()")
>
> from the arm64 tree
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

Thanks. Looks good to me.
Reviewed-by: Baolin Wang <baolin.wang@xxxxxxxxxxxxxxxxx>

> ---
>   arch/arm64/mm/hugetlbpage.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
> index 5bdf913dedc7..30f5b76aabe9 100644
> --- a/arch/arm64/mm/hugetlbpage.c
> +++ b/arch/arm64/mm/hugetlbpage.c
> @@ -490,7 +490,7 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,
>   		return ptep_clear_flush(vma, addr, ptep);
>   
>   	ncontig = find_num_contig(vma->vm_mm, addr, ptep, &pgsize);
> -	return get_clear_flush(vma->vm_mm, addr, ptep, pgsize, ncontig);
> +	return get_clear_contig(vma->vm_mm, addr, ptep, pgsize, ncontig);
>   }
>   
>   static int __init hugetlbpage_init(void)