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; }