From: Peter Zijlstra <peterz@infradead.org> mainline inclusion from mainline-5.2-rc1 commit 8b6dd0c47894e2c190560914318aa4181bc8c2f2 category: feature bugzilla: NA CVE:NA -------------------------------- Needed for ia64 -- alternatively we drop the entire hook. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Will Deacon <will.deacon@arm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Lutomirski <luto@kernel.org> Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Nick Piggin <npiggin@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rik van Riel <riel@surriel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Chen Jun <chenjun102@huawei.com> Reviewed-by: Hanjun Guo <guohanjun@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- include/asm-generic/tlb.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index a88082b4be5c..0743e03c8ba2 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -624,6 +624,8 @@ static inline void tlb_flush_p4d_range(struct mmu_gather *tlb, #endif /* CONFIG_MMU */ +#ifndef tlb_migrate_finish #define tlb_migrate_finish(mm) do {} while (0) +#endif #endif /* _ASM_GENERIC__TLB_H */ -- 2.25.1