diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-04 23:59:32 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-04 23:59:32 +0100 |
| commit | d5e4cc8faf91bb408fdf2767f73dcfee35e193da (patch) | |
| tree | 44cd8594c67531235d33e4d65394e36d839f1839 /include/linux/nvme.h | |
| parent | 7253b85cc62d6ff84143d96fe6cd54f73736f4d7 (diff) | |
| parent | a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 (diff) | |
Merge commit 'v3.6' into fixes
Diffstat (limited to 'include/linux/nvme.h')
| -rw-r--r-- | include/linux/nvme.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 9490a00529f4..c25cccaa555a 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -35,8 +35,10 @@ struct nvme_bar { __u64 acq; /* Admin CQ Base Address */ }; +#define NVME_CAP_MQES(cap) ((cap) & 0xffff) #define NVME_CAP_TIMEOUT(cap) (((cap) >> 24) & 0xff) #define NVME_CAP_STRIDE(cap) (((cap) >> 32) & 0xf) +#define NVME_CAP_MPSMIN(cap) (((cap) >> 48) & 0xf) enum { NVME_CC_ENABLE = 1 << 0, |