aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2015-05-10 02:34:01 -0400
committerVineet Gupta <vgupta@synopsys.com>2015-05-10 02:36:57 -0400
commitdaaf40e53b5dbdf75255d58a45ce8ac65ca511a8 (patch)
tree1c0691a4447a4198bf3ce9d93e145bd420f9f7c4
parentb787f68c36d49bb1d9236f403813641efa74a031 (diff)
ARC: unbork !LLSC build
Fixes: f7d11e93ee97a locking,arch,arc: Fold atomic_ops Cc: <stable@kernel.vger.org> # 3.18 Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r--arch/arc/include/asm/atomic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 067551b6920a..9917a45fc430 100644
--- a/arch/arc/include/asm/atomic.h
+++ b/arch/arc/include/asm/atomic.h
@@ -99,7 +99,7 @@ static inline void atomic_##op(int i, atomic_t *v) \
99 atomic_ops_unlock(flags); \ 99 atomic_ops_unlock(flags); \
100} 100}
101 101
102#define ATOMIC_OP_RETURN(op, c_op) \ 102#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
103static inline int atomic_##op##_return(int i, atomic_t *v) \ 103static inline int atomic_##op##_return(int i, atomic_t *v) \
104{ \ 104{ \
105 unsigned long flags; \ 105 unsigned long flags; \