[PATCH -next v3] riscv: fix build error when CONFIG_SMP is disabled

[Palmer Dabbelt]

On Sat, 29 May 2021 01:06:57 PDT (-0700), cuibixuan at huawei.com wrote:
> Fix build error when disable CONFIG_SMP:
> mm/pgtable-generic.o: In function `.L19':
> pgtable-generic.c:(.text+0x42): undefined reference to `flush_pmd_tlb_range'
> mm/pgtable-generic.o: In function `pmdp_huge_clear_flush':
> pgtable-generic.c:(.text+0x6c): undefined reference to `flush_pmd_tlb_range'
> mm/pgtable-generic.o: In function `pmdp_invalidate':
> pgtable-generic.c:(.text+0x162): undefined reference to `flush_pmd_tlb_range'
>
> Fixes: e88b333142e4 ("riscv: mm: add THP support on 64-bit")
> Reported-by: Hulk Robot <hulkci at huawei.com>
> Signed-off-by: Bixuan Cui <cuibixuan at huawei.com>
> Acked-by: Nanyong Sun <sunnanyong at huawei.com>
> ---
> Changes in v3:
> Deleted the declaration of the flush_pmd_tlb_range() in the patch
>
> Changes in v2:
> Move the declaration of flush_pmd_tlb_rang to tlbflush.h
>
>  arch/riscv/include/asm/pgtable.h  | 5 -----
>  arch/riscv/include/asm/tlbflush.h | 5 +++++
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> index 29e2c836848d..eda31002c4b1 100644
> --- a/arch/riscv/include/asm/pgtable.h
> +++ b/arch/riscv/include/asm/pgtable.h
> @@ -622,11 +622,6 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma,
>  {
>  	return __pmd(atomic_long_xchg((atomic_long_t *)pmdp, pmd_val(pmd)));
>  }
> -
> -#define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE
> -void flush_pmd_tlb_range(struct vm_area_struct *vma, unsigned long start,
> -			unsigned long end);
> -
>  #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
>
>  /*
> diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h
> index c84218ad7afc..801019381dea 100644
> --- a/arch/riscv/include/asm/tlbflush.h
> +++ b/arch/riscv/include/asm/tlbflush.h
> @@ -33,6 +33,11 @@ void flush_tlb_mm(struct mm_struct *mm);
>  void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr);
>  void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
>  		     unsigned long end);
> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE
> +#define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE
> +void flush_pmd_tlb_range(struct vm_area_struct *vma, unsigned long start,
> +			unsigned long end);
> +#endif
>  #else /* CONFIG_SMP && CONFIG_MMU */
>
>  #define flush_tlb_all() local_flush_tlb_all()

Thanks, this is on for-next.