diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2014-04-23 21:44:20 +0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-27 15:06:23 +0300 |
| commit | 658aa51459c2f5284183d35b6dd0beca0e0bfe2f (patch) | |
| tree | f4bb53537ec01ef11855fbfdd3857f4a89b944d9 /arch/sh/include/asm/atomic-irq.h | |
| parent | d0b7eb6ff2985c9350fdb297fa5727c35324d4df (diff) | |
| download | linux-658aa51459c2f5284183d35b6dd0beca0e0bfe2f.tar.xz | |
sh: Provide atomic_{or,xor,and}
Implement atomic logic ops -- atomic_{or,xor,and}.
These will replace the atomic_{set,clear}_mask functions that are
available on some archs.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/sh/include/asm/atomic-irq.h')
| -rw-r--r-- | arch/sh/include/asm/atomic-irq.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/arch/sh/include/asm/atomic-irq.h b/arch/sh/include/asm/atomic-irq.h index 61d107523f06..23fcdad5773e 100644 --- a/arch/sh/include/asm/atomic-irq.h +++ b/arch/sh/include/asm/atomic-irq.h @@ -37,27 +37,12 @@ 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 -static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) -{ - unsigned long flags; - - raw_local_irq_save(flags); - v->counter &= ~mask; - raw_local_irq_restore(flags); -} - -static inline void atomic_set_mask(unsigned int mask, atomic_t *v) -{ - unsigned long flags; - - raw_local_irq_save(flags); - v->counter |= mask; - raw_local_irq_restore(flags); -} - #endif /* __ASM_SH_ATOMIC_IRQ_H */ |