diff --git a/sys/riscv/include/atomic.h b/sys/riscv/include/atomic.h
--- a/sys/riscv/include/atomic.h
+++ b/sys/riscv/include/atomic.h
@@ -38,6 +38,8 @@
 #include <sys/atomic_common.h>
 
 #define	fence()	__asm __volatile("fence" ::: "memory");
+#define	hfence_gvma()	__asm __volatile("hfence.gvma" ::: "memory");
+
 #define	mb()	fence()
 #define	rmb()	fence()
 #define	wmb()	fence()
diff --git a/sys/riscv/vmm/vmm_riscv.c b/sys/riscv/vmm/vmm_riscv.c
--- a/sys/riscv/vmm/vmm_riscv.c
+++ b/sys/riscv/vmm/vmm_riscv.c
@@ -625,7 +625,7 @@
 	 * have been modified, it may be necessary to execute an HFENCE.GVMA
 	 * instruction (see Section 5.3.2) before or after writing hgatp.
 	 */
-	__asm __volatile("hfence.gvma" ::: "memory");
+	hfence_gvma();
 
 	csr_write(hgatp, pmap->pm_satp);
 	if (has_sstc)