diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-12 11:44:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-12 11:44:30 +0200 |
| commit | f52609fdabb1c726f8b9fdf64df3161781aa186e (patch) | |
| tree | 3b7d4a47505eddb097bab848a8ffdc4bbbf79bb7 /arch/parisc | |
| parent | 20f9ed1568c00bbd9e6af31341d25e06bc3d4a16 (diff) | |
| parent | 41b9e9fcc1c44b84a785115058ce9c703e3fca6e (diff) | |
| download | op-kernel-dev-f52609fdabb1c726f8b9fdf64df3161781aa186e.zip op-kernel-dev-f52609fdabb1c726f8b9fdf64df3161781aa186e.tar.gz | |
Merge branch 'locking/arch-atomic' into locking/core, because it's ready for upstream
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/include/asm/atomic.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h index 226f8ca9..2536965 100644 --- a/arch/parisc/include/asm/atomic.h +++ b/arch/parisc/include/asm/atomic.h @@ -126,6 +126,10 @@ static __inline__ int atomic_##op##_return(int i, atomic_t *v) \ ATOMIC_OPS(add, +=) ATOMIC_OPS(sub, -=) +ATOMIC_OP(and, &=) +ATOMIC_OP(or, |=) +ATOMIC_OP(xor, ^=) + #undef ATOMIC_OPS #undef ATOMIC_OP_RETURN #undef ATOMIC_OP @@ -185,6 +189,9 @@ static __inline__ s64 atomic64_##op##_return(s64 i, atomic64_t *v) \ ATOMIC64_OPS(add, +=) ATOMIC64_OPS(sub, -=) +ATOMIC64_OP(and, &=) +ATOMIC64_OP(or, |=) +ATOMIC64_OP(xor, ^=) #undef ATOMIC64_OPS #undef ATOMIC64_OP_RETURN |
