Make sure to not conflict with the defaults provided by generic/tlb.h. Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Cc: Steve Capper <steve.capper@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Richard Weinberger <richard@xxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx Signed-off-by: Richard Weinberger <richard@xxxxxx> --- arch/arm64/include/asm/tlb.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h index 80e2c08..65a474d 100644 --- a/arch/arm64/include/asm/tlb.h +++ b/arch/arm64/include/asm/tlb.h @@ -19,7 +19,14 @@ #ifndef __ASM_TLB_H #define __ASM_TLB_H +/* These defines are needed to override the defaults from asm-generic/tlb.h */ #define __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry +#define tlb_start_vma tlb_start_vma +#define tlb_end_vma tlb_end_vma +#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry +#define tlb_flush tlb_flush +#define __pte_free_tlb __pte_free_tlb +#define __pmd_free_tlb __pmd_free_tlb #include <asm-generic/tlb.h> -- 1.8.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
