summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/include
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-09-21 11:51:31 +0000
committerMike Frysinger <vapier@gentoo.org>2011-01-10 07:18:12 -0500
commit71a516adb6f3f178b0a961c55e7da75f8947afa5 (patch)
treef77f3fea2de37a28d813308c38591e38a0863ffa /arch/blackfin/include
parent9c199b5965c76f90b297e01accb933624dc8d242 (diff)
downloadop-kernel-dev-71a516adb6f3f178b0a961c55e7da75f8947afa5.zip
op-kernel-dev-71a516adb6f3f178b0a961c55e7da75f8947afa5.tar.gz
Blackfin: SMP: fix asm/bitops.h errors
The common asm-generic non-atomic bitops.h defines test_bit() for us, but we need to use our own version. So redirect the definition of this func to avoid having to inline the rest of the asm-generic file. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/include')
-rw-r--r--arch/blackfin/include/asm/bitops.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h
index 3f7ef4d..29f4fd8 100644
--- 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 */
OpenPOWER on IntegriCloud