[PATCH] riscv: tlb: Provide definition of tlb_flush() before including tlb.h

From: Will Deacon
Date: Fri Aug 24 2018 - 09:33:48 EST


As of commit fd1102f0aade ("mm: mmu_notifier fix for tlb_end_vma"),
asm-generic/tlb.h now calls tlb_flush() from a static inline function,
so we need to make sure that it's declared before #including the
asm-generic header in the arch header.

Since tlb_flush() is a one-liner for riscv, we can define it before
including asm-generic/tlb.h as long as we provide a forward declaration
of struct mmu_gather.

Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
---
arch/riscv/include/asm/tlb.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/riscv/include/asm/tlb.h b/arch/riscv/include/asm/tlb.h
index c229509288ea..a3d1380ad970 100644
--- a/arch/riscv/include/asm/tlb.h
+++ b/arch/riscv/include/asm/tlb.h
@@ -14,11 +14,13 @@
#ifndef _ASM_RISCV_TLB_H
#define _ASM_RISCV_TLB_H

-#include <asm-generic/tlb.h>
+struct mmu_gather;

static inline void tlb_flush(struct mmu_gather *tlb)
{
flush_tlb_mm(tlb->mm);
}

+#include <asm-generic/tlb.h>
+
#endif /* _ASM_RISCV_TLB_H */
--
2.7.4