git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
blackfin
/
include
/
asm
/
bitops.h
diff --git
a/arch/blackfin/include/asm/bitops.h
b/arch/blackfin/include/asm/bitops.h
index
3f7ef4d
..
29f4fd8
100644
(file)
--- a/
arch/blackfin/include/asm/bitops.h
+++ b/
arch/blackfin/include/asm/bitops.h
@@
-108,7
+108,9
@@
static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
#define smp_mb__before_clear_bit() barrier()
#define smp_mb__after_clear_bit() barrier()
+#define test_bit __skip_test_bit
#include <asm-generic/bitops/non-atomic.h>
+#undef test_bit
#endif /* CONFIG_SMP */