Skip to contentSkip to conversation

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

PATCH In review Guenter Roeck 2 participants 2 messages Aug 24, 2018 – Aug 27, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 riscv: tlb: Provide definition of tlb_flush() before including tlb.h

From: Will Deacon <[email protected]>

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.

Fixes fd1102f0aade ("mm: mmu_notifier fix for tlb_end_vma")
[groeck: Use forward declaration instead of moving inline function]
---
 arch/riscv/include/asm/tlb.h | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/include/asm/tlb.h +4 -0
index c229509288ea..439dc7072e05 100644
@@ -14,6 +14,10 @@
 #ifndef _ASM_RISCV_TLB_H
 #define _ASM_RISCV_TLB_H
 
+struct mmu_gather;
+
+static void tlb_flush(struct mmu_gather *tlb);
+
 #include <asm-generic/tlb.h>
 
 static inline void tlb_flush(struct mmu_gather *tlb)
Signature · 1 line
2.7.4
#1 lore raw
Quoted 21 lines · linux at roeck-us.net

From: Will Deacon <[email protected]>

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.

Fixes fd1102f0aade ("mm: mmu_notifier fix for tlb_end_vma")
[groeck: Use forward declaration instead of moving inline function]
---
 arch/riscv/include/asm/tlb.h | 4 ++++
 1 file changed, 4 insertions(+)
arch/riscv/include/asm/tlb.h +0 -0
index c229509288ea..439dc7072e05 100644

arch/riscv/include/asm/tlb.h line 23

Quoted 10 lines
arch/riscv/include/asm/tlb.h +4 -0
@@ -14,6 +14,10 @@
 #ifndef _ASM_RISCV_TLB_H
 #define _ASM_RISCV_TLB_H
 
+struct mmu_gather;
+
+static void tlb_flush(struct mmu_gather *tlb);
+
 #include <asm-generic/tlb.h>
 
 static inline void tlb_flush(struct mmu_gather *tlb)

Thanks! I'm going to take this into my for-linus branch which I'm still hoping to tag today, pending my email queue.