[PATCH 3.19.y-ckt 047/146] ARC: unbork !LLSC build
Kamal Mostafa
kamal at canonical.com
Wed Jun 17 22:22:32 UTC 2015
3.19.8-ckt2 -stable review patch. If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <vgupta at synopsys.com>
commit daaf40e53b5dbdf75255d58a45ce8ac65ca511a8 upstream.
Fixes: f7d11e93ee97a locking,arch,arc: Fold atomic_ops
Signed-off-by: Vineet Gupta <vgupta at synopsys.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
arch/arc/include/asm/atomic.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 067551b..9917a45 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; \
--
1.9.1
More information about the kernel-team
mailing list