|
@@ -237,3 +237,68 @@ static inline int bclr_mem_test_and_clear_bit(int nr,
|
|
|
static inline int bfclr_mem_test_and_clear_bit(int nr,
|
|
|
volatile unsigned long *vaddr)
|
|
|
{
|
|
|
+ char retval;
|
|
|
+
|
|
|
+ __asm__ __volatile__ ("bfclr %2{%1:#1}; sne %0"
|
|
|
+ : "=d" (retval)
|
|
|
+ : "d" (nr ^ 31), "o" (*vaddr)
|
|
|
+ : "memory");
|
|
|
+ return retval;
|
|
|
+}
|
|
|
+
|
|
|
+#if defined(CONFIG_COLDFIRE)
|
|
|
+#define test_and_clear_bit(nr, vaddr) bclr_reg_test_and_clear_bit(nr, vaddr)
|
|
|
+#elif defined(CONFIG_CPU_HAS_NO_BITFIELDS)
|
|
|
+#define test_and_clear_bit(nr, vaddr) bclr_mem_test_and_clear_bit(nr, vaddr)
|
|
|
+#else
|
|
|
+#define test_and_clear_bit(nr, vaddr) (__builtin_constant_p(nr) ? \
|
|
|
+ bclr_mem_test_and_clear_bit(nr, vaddr) : \
|
|
|
+ bfclr_mem_test_and_clear_bit(nr, vaddr))
|
|
|
+#endif
|
|
|
+
|
|
|
+#define __test_and_clear_bit(nr, vaddr) test_and_clear_bit(nr, vaddr)
|
|
|
+
|
|
|
+
|
|
|
+static inline int bchg_reg_test_and_change_bit(int nr,
|
|
|
+ volatile unsigned long *vaddr)
|
|
|
+{
|
|
|
+ char *p = (char *)vaddr + (nr ^ 31) / 8;
|
|
|
+ char retval;
|
|
|
+
|
|
|
+ __asm__ __volatile__ ("bchg %2,(%1); sne %0"
|
|
|
+ : "=d" (retval)
|
|
|
+ : "a" (p), "di" (nr & 7)
|
|
|
+ : "memory");
|
|
|
+ return retval;
|
|
|
+}
|
|
|
+
|
|
|
+static inline int bchg_mem_test_and_change_bit(int nr,
|
|
|
+ volatile unsigned long *vaddr)
|
|
|
+{
|
|
|
+ char *p = (char *)vaddr + (nr ^ 31) / 8;
|
|
|
+ char retval;
|
|
|
+
|
|
|
+ __asm__ __volatile__ ("bchg %2,%1; sne %0"
|
|
|
+ : "=d" (retval), "+m" (*p)
|
|
|
+ : "di" (nr & 7));
|
|
|
+ return retval;
|
|
|
+}
|
|
|
+
|
|
|
+static inline int bfchg_mem_test_and_change_bit(int nr,
|
|
|
+ volatile unsigned long *vaddr)
|
|
|
+{
|
|
|
+ char retval;
|
|
|
+
|
|
|
+ __asm__ __volatile__ ("bfchg %2{%1:#1}; sne %0"
|
|
|
+ : "=d" (retval)
|
|
|
+ : "d" (nr ^ 31), "o" (*vaddr)
|
|
|
+ : "memory");
|
|
|
+ return retval;
|
|
|
+}
|
|
|
+
|
|
|
+#if defined(CONFIG_COLDFIRE)
|
|
|
+#define test_and_change_bit(nr, vaddr) bchg_reg_test_and_change_bit(nr, vaddr)
|
|
|
+#elif defined(CONFIG_CPU_HAS_NO_BITFIELDS)
|
|
|
+#define test_and_change_bit(nr, vaddr) bchg_mem_test_and_change_bit(nr, vaddr)
|
|
|
+#else
|
|
|
+#define test_and_change_bit(nr, vaddr) (__builtin_constant_p(nr) ? \
|