Skip to content

Commit

Permalink
arch: Move smp_mb__{before,after}_atomic_{inc,dec}.h into asm/atomic.h
Browse files Browse the repository at this point in the history
Move the barriers functions that depend on the atomic implementation
into the atomic implementation.

Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Vineet Gupta <vgupta@synopsys.com> [for arch/arc bits]
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20131213150640.786183683@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Jan 12, 2014
1 parent 2e4f538 commit 1de7da3
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
5 changes: 5 additions & 0 deletions arch/arc/include/asm/atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,11 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)

#endif /* !CONFIG_ARC_HAS_LLSC */

#define smp_mb__before_atomic_dec() barrier()
#define smp_mb__after_atomic_dec() barrier()
#define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier()

/**
* __atomic_add_unless - add unless the number is a given value
* @v: pointer of type atomic_t
Expand Down
5 changes: 0 additions & 5 deletions arch/arc/include/asm/barrier.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
#define smp_wmb() barrier()
#endif

#define smp_mb__before_atomic_dec() barrier()
#define smp_mb__after_atomic_dec() barrier()
#define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier()

#define smp_read_barrier_depends() do { } while (0)

#endif
Expand Down
6 changes: 5 additions & 1 deletion arch/hexagon/include/asm/atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,12 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
#define atomic_sub_and_test(i, v) (atomic_sub_return(i, (v)) == 0)
#define atomic_add_negative(i, v) (atomic_add_return(i, (v)) < 0)


#define atomic_inc_return(v) (atomic_add_return(1, v))
#define atomic_dec_return(v) (atomic_sub_return(1, v))

#define smp_mb__before_atomic_dec() barrier()
#define smp_mb__after_atomic_dec() barrier()
#define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier()

#endif
4 changes: 0 additions & 4 deletions arch/hexagon/include/asm/barrier.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
#define smp_read_barrier_depends() barrier()
#define smp_wmb() barrier()
#define smp_mb() barrier()
#define smp_mb__before_atomic_dec() barrier()
#define smp_mb__after_atomic_dec() barrier()
#define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier()

/* Set a value and use a memory barrier. Used by the scheduler somewhere. */
#define set_mb(var, value) \
Expand Down

0 comments on commit 1de7da3

Please sign in to comment.