3.16.36-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Vineet Gupta <vgu...@synopsys.com> commit daaf40e53b5dbdf75255d58a45ce8ac65ca511a8 upstream. Fixes: f7d11e93ee97a locking,arch,arc: Fold atomic_ops Signed-off-by: Vineet Gupta <vgu...@synopsys.com> Signed-off-by: Ben Hutchings <b...@decadent.org.uk> Cc: Guenter Roeck <li...@roeck-us.net> --- arch/arc/include/asm/atomic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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, at 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; \