---

yaml --- r: 250412 b: refs/heads/master c: 48e1328 h: refs/heads/master v: v3
git-mirror · May 24, 2011 · 2f857e6 · 2f857e6
1 parent ae6c79e
commit 2f857e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b60de9f5142ffc677e4e1bf0d1e8ad177d21095f
+refs/heads/master: 48e1328e06dd9bd7a4932ee47428475963ea55b0
diff --git a/trunk/arch/m68k/include/asm/bitops_no.h b/trunk/arch/m68k/include/asm/bitops_no.h
@@ -246,23 +246,7 @@ static inline int __test_and_clear_bit_le(int nr, volatile void *addr)
 	return retval;
 }
 
-#define ext2_set_bit_atomic(lock, nr, addr)		\
-	({						\
-		int ret;				\
-		spin_lock(lock);			\
-		ret = __test_and_set_bit_le((nr), (addr));	\
-		spin_unlock(lock);			\
-		ret;					\
-	})
-
-#define ext2_clear_bit_atomic(lock, nr, addr)		\
-	({						\
-		int ret;				\
-		spin_lock(lock);			\
-		ret = __test_and_clear_bit_le((nr), (addr));	\
-		spin_unlock(lock);			\
-		ret;					\
-	})
+#include <asm-generic/bitops/ext2-atomic.h>
 
 static inline int test_bit_le(int nr, const volatile void *addr)
 {