[PATCH] powerpc/mm/book3s/hash: Rename flush_tlb_pmd_range

[Christophe Leroy]

Le 07/09/2022 à 10:19, Aneesh Kumar K.V a écrit :
> This function does the hash page table update. Hence rename it to
> indicate this better to avoid confusion with flush_pmd_tlb_range()
> 
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.ibm.com>
> ---
>   arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 5 ++---
>   arch/powerpc/mm/book3s64/hash_pgtable.c            | 2 +-
>   arch/powerpc/mm/book3s64/hash_tlb.c                | 2 +-
>   3 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h b/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h
> index 8b762f282190..fd30fa20c392 100644
> --- a/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h
> +++ b/arch/powerpc/include/asm/book3s/64/tlbflush-hash.h
> @@ -112,13 +112,12 @@ static inline void hash__flush_tlb_kernel_range(unsigned long start,
>   
>   struct mmu_gather;
>   extern void hash__tlb_flush(struct mmu_gather *tlb);
> -void flush_tlb_pmd_range(struct mm_struct *mm, pmd_t *pmd, unsigned long addr);
>   
>   #ifdef CONFIG_PPC_64S_HASH_MMU
>   /* Private function for use by PCI IO mapping code */
>   extern void __flush_hash_table_range(unsigned long start, unsigned long end);
> -extern void flush_tlb_pmd_range(struct mm_struct *mm, pmd_t *pmd,
> -				unsigned long addr);
> +extern void flush_hash_table_pmd_range(struct mm_struct *mm, pmd_t *pmd,
> +				       unsigned long addr);

'extern' keyword is pointless and deprecated, would be better to remove it.

>   #else
>   static inline void __flush_hash_table_range(unsigned long start, unsigned long end) { }
>   #endif
> diff --git a/arch/powerpc/mm/book3s64/hash_pgtable.c b/arch/powerpc/mm/book3s64/hash_pgtable.c
> index ae008b9df0e6..f30131933a01 100644
> --- a/arch/powerpc/mm/book3s64/hash_pgtable.c
> +++ b/arch/powerpc/mm/book3s64/hash_pgtable.c
> @@ -256,7 +256,7 @@ pmd_t hash__pmdp_collapse_flush(struct vm_area_struct *vma, unsigned long addres
>   	 * the __collapse_huge_page_copy can result in copying
>   	 * the old content.
>   	 */
> -	flush_tlb_pmd_range(vma->vm_mm, &pmd, address);
> +	flush_hash_table_pmd_range(vma->vm_mm, &pmd, address);
>   	return pmd;
>   }
>   
> diff --git a/arch/powerpc/mm/book3s64/hash_tlb.c b/arch/powerpc/mm/book3s64/hash_tlb.c
> index eb0bccaf221e..a64ea0a7ef96 100644
> --- a/arch/powerpc/mm/book3s64/hash_tlb.c
> +++ b/arch/powerpc/mm/book3s64/hash_tlb.c
> @@ -221,7 +221,7 @@ void __flush_hash_table_range(unsigned long start, unsigned long end)
>   	local_irq_restore(flags);
>   }
>   
> -void flush_tlb_pmd_range(struct mm_struct *mm, pmd_t *pmd, unsigned long addr)
> +void flush_hash_table_pmd_range(struct mm_struct *mm, pmd_t *pmd, unsigned long addr)
>   {
>   	pte_t *pte;
>   	pte_t *start_pte;