Index: nvmm.h
===================================================================
RCS file: /cvsroot/src/sys/dev/nvmm/nvmm.h,v
retrieving revision 1.5
diff -u -r1.5 nvmm.h
--- nvmm.h	21 Mar 2019 20:21:40 -0000	1.5
+++ nvmm.h	12 Apr 2019 12:46:43 -0000
@@ -61,14 +61,15 @@
 	NVMM_EXIT_MWAIT		= 0x0000000000001001,
 	NVMM_EXIT_MWAIT_COND	= 0x0000000000001002,
 
-	NVMM_EXIT_INVALID	= 0xFFFFFFFFFFFFFFFF
+	NVMM_EXIT_INVALID	= 0x7FFFFFFF
 };
 
 struct nvmm_exit_memory {
-	int prot;
 	gpaddr_t gpa;
+	int prot;
 	uint8_t inst_len;
 	uint8_t inst_bytes[15];
+	uint8_t pad[4];
 };
 
 enum nvmm_exit_io_type {