Merge tag 'v3.16-rc5' into timers/core

[sfrench/cifs-2.6.git] / block / blk-mq-tag.h

diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h
index 98696a65d4d45243d45a406c866c1cf93ff89c97..6206ed17ef766714b655a715ffbc05fd34b0463a 100644 (file)
--- a/block/blk-mq-tag.h
+++ b/block/blk-mq-tag.h
@@ -24,7 +24,7 @@ struct blk_mq_bitmap_tags {
        unsigned int map_nr;
        struct blk_align_bitmap *map;
 
-       unsigned int wake_index;
+       atomic_t wake_index;
        struct bt_wait_state *bs;
 };