diff options
| author | Mike Frysinger | 2011-07-26 16:09:10 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-07-26 16:49:47 -0700 |
| commit | f6081bd3f8152cdd3d857f55631bbb4b72182b82 (patch) | |
| tree | fa6cf9b5432ea33d8182d2a64465d28ecfc13315 /include/asm-generic | |
| parent | 3eea44ea753923c6af90be808426ecddc482de61 (diff) | |
asm-generic/atomic.h: fix type used in atomic_clear_mask
The atomic helpers are supposed to take an atomic_t pointer, not a random
unsigned long pointer. So convert atomic_clear_mask over.
While we're here, also add some nice documentation to the func.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Arun Sharma <asharma@fb.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/atomic.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index 2a23da03365e..4e8ecf0693e9 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h @@ -140,13 +140,20 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u) return c; } -static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) +/** + * atomic_clear_mask - Atomically clear bits in atomic variable + * @mask: Mask of the bits to be cleared + * @v: pointer of type atomic_t + * + * Atomically clears the bits set in @mask from @v + */ +static inline void atomic_clear_mask(unsigned long mask, atomic_t *v) { unsigned long flags; mask = ~mask; raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */ - *addr &= mask; + v->counter &= mask; raw_local_irq_restore(flags); } |