arch,cris: Convert smp_mb__*()
Cris fully relies on asm-generic/barrier.h, therefore its smp_mb() is barrier(), thus we can use the default implementation that uses smp_mb(). (Include asm/system.h and asm/barrier.h to avoid header dependency hell.) Signed-off-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Link: http://lkml.kernel.org/n/tip-wvewbe8os3s1e4pt1cdotuee@git.kernel.org Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mikael Starvik <starvik@axis.com> Cc: linux-cris-kernel@axis.com Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
a8ec1516a7
commit
17b40213ab
|
@ -7,6 +7,8 @@
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <asm/cmpxchg.h>
|
#include <asm/cmpxchg.h>
|
||||||
#include <arch/atomic.h>
|
#include <arch/atomic.h>
|
||||||
|
#include <arch/system.h>
|
||||||
|
#include <asm/barrier.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Atomic operations that C can't guarantee us. Useful for
|
* Atomic operations that C can't guarantee us. Useful for
|
||||||
|
@ -151,10 +153,4 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Atomic operations are already serializing */
|
|
||||||
#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
|
#endif
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <arch/bitops.h>
|
#include <arch/bitops.h>
|
||||||
#include <linux/atomic.h>
|
#include <linux/atomic.h>
|
||||||
#include <linux/compiler.h>
|
#include <linux/compiler.h>
|
||||||
|
#include <asm/barrier.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* set_bit - Atomically set a bit in memory
|
* set_bit - Atomically set a bit in memory
|
||||||
|
@ -42,7 +43,7 @@
|
||||||
*
|
*
|
||||||
* clear_bit() is atomic and may not be reordered. However, it does
|
* clear_bit() is atomic and may not be reordered. However, it does
|
||||||
* not contain a memory barrier, so if it is used for locking purposes,
|
* not contain a memory barrier, so if it is used for locking purposes,
|
||||||
* you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
|
* you should call smp_mb__before_atomic() and/or smp_mb__after_atomic()
|
||||||
* in order to ensure changes are visible on other processors.
|
* in order to ensure changes are visible on other processors.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -84,12 +85,6 @@ static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* clear_bit() doesn't provide any barrier for the compiler.
|
|
||||||
*/
|
|
||||||
#define smp_mb__before_clear_bit() barrier()
|
|
||||||
#define smp_mb__after_clear_bit() barrier()
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* test_and_clear_bit - Clear a bit and return its old value
|
* test_and_clear_bit - Clear a bit and return its old value
|
||||||
* @nr: Bit to clear
|
* @nr: Bit to clear
|
||||||
|
|
Loading…
Reference in a new issue