diff options
| author |   David Daney <ddaney@caviumnetworks.com> | 2010-01-08 17:17:43 -0800 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 12:53:06 +0100 |
| commit | f252ffd50c97dae87b45f1dbad24f71358ccfbd6 (patch) | |
| tree | c057fc7c3a819152603b286f935fb367fc48ae73 /arch/mips/include/asm/system.h | |
| parent | MIPS: Remove unused macros from barrier.h (diff) | |
| download | linux-dev-f252ffd50c97dae87b45f1dbad24f71358ccfbd6.tar.xz linux-dev-f252ffd50c97dae87b45f1dbad24f71358ccfbd6.zip | |
MIPS: New macro smp_mb__before_llsc.
Replace some instances of smp_llsc_mb() with a new macro
smp_mb__before_llsc(). It is used before ll/sc sequences that are
documented as needing write barrier semantics.
The default implementation of smp_mb__before_llsc() is just smp_llsc_mb(),
so there are no changes in semantics.
Also simplify definition of smp_mb(), smp_rmb(), and smp_wmb() to be just
barrier() in the non-SMP case.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/851/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm/system.h')
| -rw-r--r-- | arch/mips/include/asm/system.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h index 83b5509e09e8..bb937ccfba1e 100644 --- a/arch/mips/include/asm/system.h +++ b/arch/mips/include/asm/system.h @@ -95,6 +95,8 @@ static inline unsigned long __xchg_u32(volatile int * m, unsigned int val) { __u32 retval; + smp_mb__before_llsc(); + if (kernel_uses_llsc && R10000_LLSC_WAR) { unsigned long dummy; @@ -147,6 +149,8 @@ static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val) { __u64 retval; + smp_mb__before_llsc(); + if (kernel_uses_llsc && R10000_LLSC_WAR) { unsigned long dummy; |