diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-03-17 13:06:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 08:20:48 -0400 |
commit | 4e857c58efeb99393cba5a5d0d8ec7117183137c (patch) | |
tree | 3f6fd464e4fddb2fe90374c075c9d06603cf8bbc /block | |
parent | 1b15611e1c30b37abe393d411c316cd659920bf5 (diff) |
arch: Mass conversion of smp_mb__*()
Mostly scripted conversion of the smp_mb__* barriers.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-55dhyhocezdw1dg7u19hmh1u@git.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-iopoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c index c11d24e379e2..f8c6a11b13f0 100644 --- a/block/blk-iopoll.c +++ b/block/blk-iopoll.c | |||
@@ -49,7 +49,7 @@ EXPORT_SYMBOL(blk_iopoll_sched); | |||
49 | void __blk_iopoll_complete(struct blk_iopoll *iop) | 49 | void __blk_iopoll_complete(struct blk_iopoll *iop) |
50 | { | 50 | { |
51 | list_del(&iop->list); | 51 | list_del(&iop->list); |
52 | smp_mb__before_clear_bit(); | 52 | smp_mb__before_atomic(); |
53 | clear_bit_unlock(IOPOLL_F_SCHED, &iop->state); | 53 | clear_bit_unlock(IOPOLL_F_SCHED, &iop->state); |
54 | } | 54 | } |
55 | EXPORT_SYMBOL(__blk_iopoll_complete); | 55 | EXPORT_SYMBOL(__blk_iopoll_complete); |
@@ -161,7 +161,7 @@ EXPORT_SYMBOL(blk_iopoll_disable); | |||
161 | void blk_iopoll_enable(struct blk_iopoll *iop) | 161 | void blk_iopoll_enable(struct blk_iopoll *iop) |
162 | { | 162 | { |
163 | BUG_ON(!test_bit(IOPOLL_F_SCHED, &iop->state)); | 163 | BUG_ON(!test_bit(IOPOLL_F_SCHED, &iop->state)); |
164 | smp_mb__before_clear_bit(); | 164 | smp_mb__before_atomic(); |
165 | clear_bit_unlock(IOPOLL_F_SCHED, &iop->state); | 165 | clear_bit_unlock(IOPOLL_F_SCHED, &iop->state); |
166 | } | 166 | } |
167 | EXPORT_SYMBOL(blk_iopoll_enable); | 167 | EXPORT_SYMBOL(blk_iopoll_enable); |