diff --git a/hypervisor/include/arch/riscv/asm/cpu.h b/hypervisor/include/arch/riscv/asm/cpu.h
index e1e89f71e..117a3c208 100644
--- a/hypervisor/include/arch/riscv/asm/cpu.h
+++ b/hypervisor/include/arch/riscv/asm/cpu.h
@@ -117,9 +117,7 @@ struct stack_frame {
  */
 static inline uint16_t arch_get_pcpu_id(void)
 {
-	uint16_t pcpu_id;
-
-	asm volatile ("mv %0, tp" : "=r" (pcpu_id) : : );
+	register uint16_t pcpu_id asm ("tp");
 	return pcpu_id;
 }