Index: head/sys/riscv/include/riscvreg.h
===================================================================
--- head/sys/riscv/include/riscvreg.h
+++ head/sys/riscv/include/riscvreg.h
@@ -37,8 +37,7 @@
 #ifndef _MACHINE_RISCVREG_H_
 #define	_MACHINE_RISCVREG_H_
 
-#define	EXCP_SHIFT			0
-#define	EXCP_MASK			(0xf << EXCP_SHIFT)
+#define	EXCP_MASK			(~EXCP_INTR)
 #define	EXCP_MISALIGNED_FETCH		0
 #define	EXCP_FAULT_FETCH		1
 #define	EXCP_ILLEGAL_INSTRUCTION	2