projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'char-misc-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[cascardo/linux.git]
/
block
/
blk-mq-tag.h
diff --git
a/block/blk-mq-tag.h
b/block/blk-mq-tag.h
index
98696a6
..
6206ed1
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 map_nr;
struct blk_align_bitmap *map;
-
unsigned in
t wake_index;
+
atomic_
t wake_index;
struct bt_wait_state *bs;
};
struct bt_wait_state *bs;
};