From a7af88af398ff76e3be18fb8a0ef5216b73a750b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 21 Sep 2009 11:51:31 +0000
Subject: [PATCH] --- yaml --- r: 228435 b: refs/heads/master c:
 71a516adb6f3f178b0a961c55e7da75f8947afa5 h: refs/heads/master i:   228433:
 d617112dc33c2a8ebe9d4c5719d3415da49cb2bb   228431:
 22e1c0055da5d0d473247e9c484722c43c7a0a3d v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/blackfin/include/asm/bitops.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 11a781218c4d..dd377d9cf3ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c199b5965c76f90b297e01accb933624dc8d242
+refs/heads/master: 71a516adb6f3f178b0a961c55e7da75f8947afa5
diff --git a/trunk/arch/blackfin/include/asm/bitops.h b/trunk/arch/blackfin/include/asm/bitops.h
index 3f7ef4d97791..29f4fd886174 100644
--- a/trunk/arch/blackfin/include/asm/bitops.h
+++ b/trunk/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 */