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 /kernel/rcu/tree_plugin.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 'kernel/rcu/tree_plugin.h')
-rw-r--r-- | kernel/rcu/tree_plugin.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h index 962d1d589929..56db2f853e43 100644 --- a/kernel/rcu/tree_plugin.h +++ b/kernel/rcu/tree_plugin.h | |||
@@ -2523,9 +2523,9 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq) | |||
2523 | /* Record start of fully idle period. */ | 2523 | /* Record start of fully idle period. */ |
2524 | j = jiffies; | 2524 | j = jiffies; |
2525 | ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j; | 2525 | ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j; |
2526 | smp_mb__before_atomic_inc(); | 2526 | smp_mb__before_atomic(); |
2527 | atomic_inc(&rdtp->dynticks_idle); | 2527 | atomic_inc(&rdtp->dynticks_idle); |
2528 | smp_mb__after_atomic_inc(); | 2528 | smp_mb__after_atomic(); |
2529 | WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1); | 2529 | WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1); |
2530 | } | 2530 | } |
2531 | 2531 | ||
@@ -2590,9 +2590,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq) | |||
2590 | } | 2590 | } |
2591 | 2591 | ||
2592 | /* Record end of idle period. */ | 2592 | /* Record end of idle period. */ |
2593 | smp_mb__before_atomic_inc(); | 2593 | smp_mb__before_atomic(); |
2594 | atomic_inc(&rdtp->dynticks_idle); | 2594 | atomic_inc(&rdtp->dynticks_idle); |
2595 | smp_mb__after_atomic_inc(); | 2595 | smp_mb__after_atomic(); |
2596 | WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1)); | 2596 | WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1)); |
2597 | 2597 | ||
2598 | /* | 2598 | /* |