summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/bitops.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-11-20 15:25:22 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-12-22 18:42:53 +0900
commit16b529d1d78060254d5bc735390915ca5ccf13a1 (patch)
tree6e28039e44bb1faa421d38a611f352da1f70697b /arch/sh/include/asm/bitops.h
parent709420dd4e75083ee7920e61c2d0bcc3db9b7405 (diff)
sh: Convert to generic bitops for IRQ-toggling implementation.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/bitops.h')
-rw-r--r--arch/sh/include/asm/bitops.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/sh/include/asm/bitops.h b/arch/sh/include/asm/bitops.h
index 367930d8e5a..9b141e04d10 100644
--- a/arch/sh/include/asm/bitops.h
+++ b/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)
{