diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2015-09-18 15:04:59 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2015-09-23 09:54:28 +0200 |
| commit | 90fe65148ea76988d8d5acbf3e578aa74129a490 (patch) | |
| tree | bd172252066d57798ea798d0eedd95321639df65 /include/linux/atomic.h | |
| parent | Merge branch 'locking/urgent' into locking/core, to pick up fixes before applying new changes (diff) | |
| download | linux-dev-90fe65148ea76988d8d5acbf3e578aa74129a490.tar.xz linux-dev-90fe65148ea76988d8d5acbf3e578aa74129a490.zip | |
atomic: Add atomic_long_t bitops
When adding the atomic bitops, I seem to have forgotten about
atomic_long_t, fix this.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/atomic.h')
| -rw-r--r-- | include/linux/atomic.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/atomic.h b/include/linux/atomic.h index 00a5763e850e..29dafa184aeb 100644 --- a/include/linux/atomic.h +++ b/include/linux/atomic.h @@ -451,7 +451,6 @@ static inline int atomic_dec_if_positive(atomic_t *v) } #endif -#include <asm-generic/atomic-long.h> #ifdef CONFIG_GENERIC_ATOMIC64 #include <asm-generic/atomic64.h> #endif @@ -463,4 +462,6 @@ static inline void atomic64_andnot(long long i, atomic64_t *v) } #endif +#include <asm-generic/atomic-long.h> + #endif /* _LINUX_ATOMIC_H */ |