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 /include/linux/interrupt.h | |
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 'include/linux/interrupt.h')
-rw-r--r-- | include/linux/interrupt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index c7bfac1c4a7b..157111043281 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
@@ -453,7 +453,7 @@ static inline int tasklet_trylock(struct tasklet_struct *t) | |||
453 | 453 | ||
454 | static inline void tasklet_unlock(struct tasklet_struct *t) | 454 | static inline void tasklet_unlock(struct tasklet_struct *t) |
455 | { | 455 | { |
456 | smp_mb__before_clear_bit(); | 456 | smp_mb__before_atomic(); |
457 | clear_bit(TASKLET_STATE_RUN, &(t)->state); | 457 | clear_bit(TASKLET_STATE_RUN, &(t)->state); |
458 | } | 458 | } |
459 | 459 | ||
@@ -501,7 +501,7 @@ static inline void tasklet_hi_schedule_first(struct tasklet_struct *t) | |||
501 | static inline void tasklet_disable_nosync(struct tasklet_struct *t) | 501 | static inline void tasklet_disable_nosync(struct tasklet_struct *t) |
502 | { | 502 | { |
503 | atomic_inc(&t->count); | 503 | atomic_inc(&t->count); |
504 | smp_mb__after_atomic_inc(); | 504 | smp_mb__after_atomic(); |
505 | } | 505 | } |
506 | 506 | ||
507 | static inline void tasklet_disable(struct tasklet_struct *t) | 507 | static inline void tasklet_disable(struct tasklet_struct *t) |
@@ -513,13 +513,13 @@ static inline void tasklet_disable(struct tasklet_struct *t) | |||
513 | 513 | ||
514 | static inline void tasklet_enable(struct tasklet_struct *t) | 514 | static inline void tasklet_enable(struct tasklet_struct *t) |
515 | { | 515 | { |
516 | smp_mb__before_atomic_dec(); | 516 | smp_mb__before_atomic(); |
517 | atomic_dec(&t->count); | 517 | atomic_dec(&t->count); |
518 | } | 518 | } |
519 | 519 | ||
520 | static inline void tasklet_hi_enable(struct tasklet_struct *t) | 520 | static inline void tasklet_hi_enable(struct tasklet_struct *t) |
521 | { | 521 | { |
522 | smp_mb__before_atomic_dec(); | 522 | smp_mb__before_atomic(); |
523 | atomic_dec(&t->count); | 523 | atomic_dec(&t->count); |
524 | } | 524 | } |
525 | 525 | ||