From: Vineet Gupta <vgupta@synopsys.com>
Date: Sun, 10 May 2015 06:34:01 +0000 (+0530)
Subject: ARC: unbork !LLSC build
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~8174^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=daaf40e53b5dbdf75255d58a45ce8ac65ca511a8;p=mirror_ubuntu-artful-kernel.git

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>
---

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;						\