forked from rrcarlosr/Jetpack
30 lines
896 B
Diff
30 lines
896 B
Diff
|
From 3d6b190747096f3ae73e694c41c2c0020fc9d0da Mon Sep 17 00:00:00 2001
|
||
|
|
From: Allen Martin <amartin@nvidia.com>
|
||
|
|
Date: Wed, 11 Oct 2017 14:37:26 -0700
|
||
|
|
Subject: [PATCH 350/352] blk-mq: change wait to swait
|
||
|
|
|
||
|
|
Change wait_event_timeout() to swait_event_timeout() because of type
|
||
|
|
change of mq_freeze_wq in PREEMPT_RT patch series.
|
||
|
|
|
||
|
|
Signed-off-by: Allen Martin <amartin@nvidia.com>
|
||
|
|
---
|
||
|
|
block/blk-mq.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/block/blk-mq.c b/block/blk-mq.c
|
||
|
|
index 9835286..2e5deb4 100644
|
||
|
|
--- a/block/blk-mq.c
|
||
|
|
+++ b/block/blk-mq.c
|
||
|
|
@@ -76,7 +76,7 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_wait);
|
||
|
|
int blk_mq_freeze_queue_wait_timeout(struct request_queue *q,
|
||
|
|
unsigned long timeout)
|
||
|
|
{
|
||
|
|
- return wait_event_timeout(q->mq_freeze_wq,
|
||
|
|
+ return swait_event_timeout(q->mq_freeze_wq,
|
||
|
|
percpu_ref_is_zero(&q->q_usage_counter),
|
||
|
|
timeout);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|