summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew.r.wilcox@intel.com>2011-02-07 15:55:59 -0500
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2011-11-04 15:52:56 -0400
commitd2d8703481f60d67f49e3177196cbe474b11377c (patch)
tree13229c9dd2c512f9ee2407a52dbfad7851313054 /drivers/block
parent9294bbed78926a895516ec016ba23033f58d1a88 (diff)
downloadblackbird-op-linux-d2d8703481f60d67f49e3177196cbe474b11377c.tar.gz
blackbird-op-linux-d2d8703481f60d67f49e3177196cbe474b11377c.zip
NVMe: Renumber the special context values
If POISON_POINTER_DELTA isn't defined, ensure they're in page 0 which should never be mapped. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nvme.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 2a0dd5e60347..71bdf6f2c93b 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -184,9 +184,9 @@ enum {
};
#define CMD_CTX_BASE (POISON_POINTER_DELTA + sync_completion_id)
-#define CMD_CTX_CANCELLED (0x2008 + CMD_CTX_BASE)
-#define CMD_CTX_COMPLETED (0x2010 + CMD_CTX_BASE)
-#define CMD_CTX_INVALID (0x2014 + CMD_CTX_BASE)
+#define CMD_CTX_CANCELLED (0x30C + CMD_CTX_BASE)
+#define CMD_CTX_COMPLETED (0x310 + CMD_CTX_BASE)
+#define CMD_CTX_INVALID (0x314 + CMD_CTX_BASE)
static unsigned long free_cmdid(struct nvme_queue *nvmeq, int cmdid)
{
OpenPOWER on IntegriCloud