Needed for (e.g.) ubifs support to work.
Signed-off-by: Simon Kagstrom simon.kagstrom@netinsight.net --- include/asm-arm/bitops.h | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h index b3a9578..b62ff90 100644 --- a/include/asm-arm/bitops.h +++ b/include/asm-arm/bitops.h @@ -18,6 +18,7 @@ #ifdef __KERNEL__
#include <asm/types.h> +#include <asm/proc/system.h>
#define smp_mb__before_clear_bit() do { } while (0) #define smp_mb__after_clear_bit() do { } while (0) @@ -55,8 +56,6 @@ static inline void __change_bit(int nr, volatile void *addr) *p ^= mask; }
-extern int test_and_set_bit(int nr, volatile void * addr); - static inline int __test_and_set_bit(int nr, volatile void *addr) { unsigned long mask = BIT_MASK(nr); @@ -67,7 +66,17 @@ static inline int __test_and_set_bit(int nr, volatile void *addr) return (old & mask) != 0; }
-extern int test_and_clear_bit(int nr, volatile void * addr); +static inline int test_and_set_bit(int nr, volatile void * addr) +{ + unsigned long flags; + int out; + + local_irq_save(flags); + out = __test_and_set_bit(nr, addr); + local_irq_restore(flags); + + return out; +}
static inline int __test_and_clear_bit(int nr, volatile void *addr) { @@ -79,6 +88,18 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) return (old & mask) != 0; }
+static inline int test_and_clear_bit(int nr, volatile void * addr) +{ + unsigned long flags; + int out; + + local_irq_save(flags); + out = __test_and_clear_bit(nr, addr); + local_irq_restore(flags); + + return out; +} + extern int test_and_change_bit(int nr, volatile void * addr);
static inline int __test_and_change_bit(int nr, volatile void *addr)