Unverified Commit 95bc69a4 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Palmer Dabbelt
Browse files

riscv: cpu_relax: switch to riscv_has_extension_likely() 



Switch cpu_relax() from static branch to the new helper
riscv_has_extension_likely()

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Reviewed-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarGuo Ren <guoren@kernel.org>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20230128172856.3814-12-jszhang@kernel.org


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent cabfd146

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


static inline void cpu_relax(void)

{

	if (!static_branch_likely(&riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_ZIHINTPAUSE])) {

	if (!riscv_has_extension_likely(RISCV_ISA_EXT_ZIHINTPAUSE)) {

#ifdef __riscv_muldiv

		int dummy;

		/* In lieu of a halt instruction, induce a long-latency stall. */