diff options
| author |   Vineet Gupta <vgupta@synopsys.com> | 2015-05-10 12:04:01 +0530 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2015-05-10 12:06:57 +0530 |
| commit | daaf40e53b5dbdf75255d58a45ce8ac65ca511a8 (patch) | |
| tree | 1c0691a4447a4198bf3ce9d93e145bd420f9f7c4 /arch/arc | |
| parent | Linux 4.1-rc1 (diff) | |
| download | linux-dev-daaf40e53b5dbdf75255d58a45ce8ac65ca511a8.tar.xz linux-dev-daaf40e53b5dbdf75255d58a45ce8ac65ca511a8.zip | |
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>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/include/asm/atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; \ |