summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2015-05-10 12:04:01 +0530
committerBen Hutchings <ben@decadent.org.uk>2016-06-15 21:29:35 +0100
commitdf929b25c8f7519a3e30eb8948d1e6e933c762d4 (patch)
treee50a897ea23d50cc8f3c6fd7d6e67774efff27e1
parentd02167c499d03de2c94a38a565ca106dbeb423ff (diff)
downloadlwn-df929b25c8f7519a3e30eb8948d1e6e933c762d4.tar.gz
lwn-df929b25c8f7519a3e30eb8948d1e6e933c762d4.zip
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>
-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 223138716c2e..7ace56e6ad23 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; \