From 2cd547f6e7d184ea7f9359464feee122f35a9014 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Mon, 4 Feb 2013 14:44:33 -0800
Subject: [PATCH] --- yaml --- r: 375039 b: refs/heads/master c:
 acb7aa0db09b8abd38abeb84334a8a27a52fbb1b h: refs/heads/master i:   375037:
 cfe853e837e04eff6fa4cb9273a4ae73baaf0d4a   375035:
 fa9a6d8342f80644809ebf4d434aa11f5cc49e67   375031:
 63aec06eec111482a9dd2847aacf1430fe1d51cb   375023:
 2ce3a1e6d7ffd9b58e4076df71e83441a2d1493a   375007:
 45385aabbe16a865244a44a38ba0105fc96e7e02   374975:
 e2cd586c572185f8656541c26cc6dcab7431af65   374911:
 65189e4c9a777a0a3158e3224a244605329e44d9   374783:
 3c01f5abe4f43d6e08ea356d3cabbaa7a394ed73 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/block/nvme-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 690dcf0ca63d..81f8b5369f03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d0f6131a79adfa1fb51309c5f81a2a4ef879dd4
+refs/heads/master: acb7aa0db09b8abd38abeb84334a8a27a52fbb1b
diff --git a/trunk/drivers/block/nvme-core.c b/trunk/drivers/block/nvme-core.c
index a89f7dbefba0..32fdfe9a5156 100644
--- a/trunk/drivers/block/nvme-core.c
+++ b/trunk/drivers/block/nvme-core.c
@@ -1309,7 +1309,7 @@ static int nvme_kthread(void *data)
 		}
 		spin_unlock(&dev_list_lock);
 		set_current_state(TASK_INTERRUPTIBLE);
-		schedule_timeout(HZ);
+		schedule_timeout(round_jiffies_relative(HZ));
 	}
 	return 0;
 }