[PATCH] RISC-V: move riscv_cbom_block_size to the correct #ifdef block

Heiko Stuebner heiko at sntech.de
Wed Sep 14 07:36:48 PDT 2022


riscv_cbom_block_size is used by all current non-coherent dma operations,
not only the zicbom variant. So move it over the block also containing
the riscv_noncoherent_supported() prototype.

Fixes: 8f7e001e0325 ("RISC-V: Clean up the Zicbom block size probing")
Reported-by: kernel test robot <lkp at intel.com>
Signed-off-by: Heiko Stuebner <heiko at sntech.de>
---
 arch/riscv/include/asm/cacheflush.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h
index a89c005b4bbf..5c16d901d3da 100644
--- a/arch/riscv/include/asm/cacheflush.h
+++ b/arch/riscv/include/asm/cacheflush.h
@@ -43,13 +43,13 @@ void flush_icache_mm(struct mm_struct *mm, bool local);
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_RISCV_ISA_ZICBOM
-extern unsigned int riscv_cbom_block_size;
 void riscv_init_cbom_blocksize(void);
 #else
 static inline void riscv_init_cbom_blocksize(void) { }
 #endif
 
 #ifdef CONFIG_RISCV_DMA_NONCOHERENT
+extern unsigned int riscv_cbom_block_size;
 void riscv_noncoherent_supported(void);
 #endif
 
-- 
2.35.1




More information about the linux-riscv mailing list