From: Mike Frysinger Date: Mon, 21 Sep 2009 11:51:31 +0000 (+0000) Subject: Blackfin: SMP: fix asm/bitops.h errors X-Git-Tag: v2.6.38-rc1~421^2~29 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=71a516adb6f3f178b0a961c55e7da75f8947afa5;p=~shefty%2Frdma-dev.git 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 --- diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h index 3f7ef4d9779..29f4fd88617 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 +#undef test_bit #endif /* CONFIG_SMP */