Skip to content

Commit dd16ac4

Browse files
mindachen1987palmer-dabbelt
authored andcommitted
riscv: Using TOOLCHAIN_HAS_ZIHINTPAUSE marco replace zihintpause
Actually it is a part of Conor's commit aae538c ("riscv: fix detection of toolchain Zihintpause support"). It is looks like a merge issue. Samuel's commit 0b1d60d ("riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y") do not base on Conor's commit and revert to __riscv_zihintpause. So this patch can fix it. Signed-off-by: Minda Chen <minda.chen@starfivetech.com> Fixes: 3c349ea ("Merge patch "riscv: Fix build with CONFIG_CC_OPTIMIZE_FOR_SIZE=y"") Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Link: https://lore.kernel.org/r/20230802064215.31111-1-minda.chen@starfivetech.com Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 92235d3 commit dd16ac4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ static inline void cpu_relax(void)
1414
__asm__ __volatile__ ("div %0, %0, zero" : "=r" (dummy));
1515
#endif
1616

17-
#ifdef __riscv_zihintpause
17+
#ifdef CONFIG_TOOLCHAIN_HAS_ZIHINTPAUSE
1818
/*
1919
* Reduce instruction retirement.
2020
* This assumes the PC changes.

0 commit comments

Comments
 (0)