From f3a45da1cb992763ec9a766c75c5c28bd1bd091a Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Mon, 7 Feb 2011 15:55:59 -0500 Subject: [PATCH] --- yaml --- r: 286254 b: refs/heads/master c: d2d8703481f60d67f49e3177196cbe474b11377c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 17974fb5fe9b..e699afc5525e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9294bbed78926a895516ec016ba23033f58d1a88 +refs/heads/master: d2d8703481f60d67f49e3177196cbe474b11377c diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index 2a0dd5e60347..71bdf6f2c93b 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/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) {