Skip to content

Commit 30aca1b

Browse files
rddunlappalmer-dabbelt
authored andcommitted
RISC-V: fix barrier() use in <vdso/processor.h>
riscv's <vdso/processor.h> uses barrier() so it should include <asm/barrier.h> Fixes this build error: CC [M] drivers/net/ethernet/emulex/benet/be_main.o In file included from ./include/vdso/processor.h:10, from ./arch/riscv/include/asm/processor.h:11, from ./include/linux/prefetch.h:15, from drivers/net/ethernet/emulex/benet/be_main.c:14: ./arch/riscv/include/asm/vdso/processor.h: In function 'cpu_relax': ./arch/riscv/include/asm/vdso/processor.h:14:2: error: implicit declaration of function 'barrier' [-Werror=implicit-function-declaration] 14 | barrier(); This happens with a total of 5 networking drivers -- they all use <linux/prefetch.h>. rv64 allmodconfig now builds cleanly after this patch. Fixes fallout from: 815f0dd ("include/linux/compiler*.h: make compiler-*.h mutually exclusive") Fixes: ad5d112 ("riscv: use vDSO common flow to reduce the latency of the time-related functions") Reported-by: Andreas Schwab <[email protected]> Signed-off-by: Randy Dunlap <[email protected]> Acked-by: Arvind Sankar <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]> Reviewed-by: Nick Desaulniers <[email protected]> Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 6134b11 commit 30aca1b

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/riscv/include/asm/vdso/processor.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#ifndef __ASSEMBLY__
66

7+
#include <asm/barrier.h>
8+
79
static inline void cpu_relax(void)
810
{
911
#ifdef __riscv_muldiv

0 commit comments

Comments
 (0)