summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-29 09:47:08 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-29 09:47:08 -0700
commitca49a601c2b4b74e5cf57fef62122204d1982372 (patch)
treeaac064c0dae4e7d1b2148b7b4b5d9595c624ca49 /include
parent5a90fa71f6d45054c78b2bd6dbc4feba1638e1d2 (diff)
parent7ac5ae4b122f9415948c642b945a26938aa8f347 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/bitops.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index c1adc6b3e86d..aad7aad026b3 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -229,6 +229,7 @@ extern int _find_next_zero_bit_be(const void * p, int size, int offset);
extern int _find_first_bit_be(const unsigned long *p, unsigned size);
extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
+#ifndef CONFIG_SMP
/*
* The __* form of bitops are non-atomic and may be reordered.
*/
@@ -241,6 +242,10 @@ extern int _find_next_bit_be(const unsigned long *p, int size, int offset);
(__builtin_constant_p(nr) ? \
____atomic_##name(nr, p) : \
_##name##_be(nr,p))
+#else
+#define ATOMIC_BITOP_LE(name,nr,p) _##name##_le(nr,p)
+#define ATOMIC_BITOP_BE(name,nr,p) _##name##_be(nr,p)
+#endif
#define NONATOMIC_BITOP(name,nr,p) \
(____nonatomic_##name(nr, p))