---

yaml --- r: 286263 b: refs/heads/master c: 897cfe1 h: refs/heads/master i: 286261: 6f70333 286259: f878ddb 286255: 15c7efc v: v3
git-mirror · Nov 4, 2011 · f08c48c · f08c48c
1 parent 5c18cf5
commit f08c48c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 768308400f5b4ce665a072eb976a851978b7706e
+refs/heads/master: 897cfe1ce7db152fa6dde576f4213a6160bf6502
diff --git a/trunk/include/linux/nvme.h b/trunk/include/linux/nvme.h
@@ -24,10 +24,12 @@
 struct nvme_bar {
 	__u64			cap;	/* Controller Capabilities */
 	__u32			vs;	/* Version */
-	__u32			ims;	/* Interrupt Mask Set */
-	__u32			imc;	/* Interrupt Mask Clear */
+	__u32			intms;	/* Interrupt Mask Set */
+	__u32			intmc;	/* Interrupt Mask Clear */
 	__u32			cc;	/* Controller Configuration */
+	__u32			rsvd1;	/* Reserved */
 	__u32			csts;	/* Controller Status */
+	__u32			rsvd2;	/* Reserved */
 	__u32			aqa;	/* Admin Queue Attributes */
 	__u64			asq;	/* Admin SQ Base Address */
 	__u64			acq;	/* Admin CQ Base Address */