diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:32:40 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:32:40 -0700 |
| commit | c7101dcf349bdb3fab576942113fb39a5c0c3ce4 (patch) | |
| tree | 007998dcbdb919dc038f0ae44422ea8cb353a1d5 /block/blk-mq.c | |
| parent | 2298563cff64db252affbe2eb5e979d59b4c0187 (diff) | |
| parent | b7be2a1de3f5c0827a4f8ccb6a18342d9d4dc446 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rt
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 1f469b374a5b..c473bd192a41 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1988,7 +1988,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, goto err_hctxs; setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q); - blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30000); + blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30 * HZ); q->nr_queues = nr_cpu_ids; q->nr_hw_queues = set->nr_hw_queues; |