Index: head/sys/riscv/riscv/pmap.c
===================================================================
--- head/sys/riscv/riscv/pmap.c
+++ head/sys/riscv/riscv/pmap.c
@@ -804,6 +804,7 @@
 	 * all sfence_vma requests as global however.
 	 */
 	sbi_remote_sfence_vma(mask.__bits, 0, 0);
+	sfence_vma();
 	sched_unpin();
 }
 #else