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>

diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 2a0dd5e60347f940881192096dcad4f9ac1a7fdc..71bdf6f2c93b56c8e49b89a70e297f77bbd8b35c 100644 (file)
--- 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)
 {