---

yaml --- r: 120060 b: refs/heads/master c: 16b529d h: refs/heads/master v: v3
git-mirror · Dec 22, 2008 · 16e56ab · 16e56ab
1 parent 809530a
commit 16e56ab
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 96 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 709420dd4e75083ee7920e61c2d0bcc3db9b7405
+refs/heads/master: 16b529d1d78060254d5bc735390915ca5ccf13a1
diff --git a/trunk/arch/sh/include/asm/bitops-grb.h b/trunk/arch/sh/include/asm/bitops-grb.h
@@ -166,4 +166,7 @@ static inline int test_and_change_bit(int nr, volatile void * addr)
 
         return retval;
 }
+
+#include <asm-generic/bitops/non-atomic.h>
+
 #endif /* __ASM_SH_BITOPS_GRB_H */
diff --git a/trunk/arch/sh/include/asm/bitops-irq.h b/trunk/arch/sh/include/asm/bitops-irq.h
diff --git a/trunk/arch/sh/include/asm/bitops-llsc.h b/trunk/arch/sh/include/asm/bitops-llsc.h
@@ -141,4 +141,6 @@ static inline int test_and_change_bit(int nr, volatile void * addr)
 	return retval != 0;
 }
 
+#include <asm-generic/bitops/non-atomic.h>
+
 #endif /* __ASM_SH_BITOPS_LLSC_H */
diff --git a/trunk/arch/sh/include/asm/bitops.h b/trunk/arch/sh/include/asm/bitops.h
@@ -16,18 +16,16 @@
 #elif defined(CONFIG_CPU_SH4A)
 #include <asm/bitops-llsc.h>
 #else
-#include <asm/bitops-irq.h>
+#include <asm-generic/bitops/atomic.h>
+#include <asm-generic/bitops/non-atomic.h>
 #endif
 
-
 /*
  * clear_bit() doesn't provide any barrier for the compiler.
  */
 #define smp_mb__before_clear_bit()	barrier()
 #define smp_mb__after_clear_bit()	barrier()
 
-#include <asm-generic/bitops/non-atomic.h>
-
 #ifdef CONFIG_SUPERH32
 static inline unsigned long ffz(unsigned long word)
 {