From: Vineet Gupta <vgupta@synopsys.com>
Date: Sun, 10 May 2015 06:34:01 +0000 (+0530)
Subject: ARC: unbork !LLSC build
X-Git-Tag: v3.16.36~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df929b25c8f7519a3e30eb8948d1e6e933c762d4;p=thirdparty%2Fkernel%2Fstable.git

ARC: unbork !LLSC build

commit daaf40e53b5dbdf75255d58a45ce8ac65ca511a8 upstream.

Fixes: f7d11e93ee97a locking,arch,arc: Fold atomic_ops
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Guenter Roeck <linux@roeck-us.net>
---

diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 223138716c2e2..7ace56e6ad23d 100644
--- a/arch/arc/include/asm/atomic.h
+++ b/arch/arc/include/asm/atomic.h
@@ -109,7 +109,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;						\