Merge branch '4.0.8-rt6'

[zynq/linux.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 7f9a516f24dec57182f51cff3580db3904208a84..44522431317f04dc3f26ab74b81c64fa3a4ed8c9 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -101,6 +101,7 @@ struct request {
        struct list_head queuelist;
        union {
                struct call_single_data csd;
+               struct work_struct work;
                unsigned long fifo_time;
        };
 
@@ -482,7 +483,7 @@ struct request_queue {
        struct throtl_data *td;
 #endif
        struct rcu_head         rcu_head;
-       wait_queue_head_t       mq_freeze_wq;
+       struct swait_head       mq_freeze_wq;
        struct percpu_ref       mq_usage_counter;
        struct list_head        all_q_node;