aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2015-05-10 12:04:01 +0530
committerSasha Levin <sasha.levin@oracle.com>2015-06-10 13:42:46 -0400
commit7d3b628cb83c4813a7d1bfae28b9a5b196d808c8 (patch)
tree47b3879d4bbd2d446352e60d39ace9b2bf1d2343
parent929275120290b354e361646d942ee905fe4c2687 (diff)
downloadlinux-linaro-stable-7d3b628cb83c4813a7d1bfae28b9a5b196d808c8.tar.gz
ARC: unbork !LLSC build
[ Upstream commit daaf40e53b5dbdf75255d58a45ce8ac65ca511a8 ] Fixes: f7d11e93ee97a locking,arch,arc: Fold atomic_ops Cc: <stable@kernel.vger.org> # 3.18 Signed-off-by: Vineet Gupta <vgupta@synopsys.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.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) \
atomic_ops_unlock(flags); \
}
-#define ATOMIC_OP_RETURN(op, c_op) \
+#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
static inline int atomic_##op##_return(int i, atomic_t *v) \
{ \
unsigned long flags; \