From f08c48c9b795d95b28f0a090263ee1c8280b752f Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Mon, 14 Feb 2011 12:20:15 -0500 Subject: [PATCH] --- yaml --- r: 286263 b: refs/heads/master c: 897cfe1ce7db152fa6dde576f4213a6160bf6502 h: refs/heads/master i: 286261: 6f703336b33470627dfb3d36048803bcae6419db 286259: f878ddbbd3c3f4da033eb3a2f9296e4a457d83ad 286255: 15c7efc4f64fe896103e231b4b9878c310a61cf0 v: v3 --- [refs] | 2 +- trunk/include/linux/nvme.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6e8a64fdd2a1..23b9cac10284 100644 --- 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 index 8eed0e432eef..757faa71666e 100644 --- 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 */