Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

1 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index ca3f2c2edd85..1da59c16f637 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -35,10 +35,12 @@ struct blk_mq_hw_ctx {
         struct sbitmap          ctx_map;
 
         struct blk_mq_ctx       *dispatch_from;
+        unsigned int            dispatch_busy;
 
-        struct blk_mq_ctx       **ctxs;
         unsigned int            nr_ctx;
+        struct blk_mq_ctx       **ctxs;
 
+        spinlock_t              dispatch_wait_lock;
         wait_queue_entry_t      dispatch_wait;
         atomic_t                wait_index;