Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6

[pandora-kernel.git] / include / asm-generic / bitops.h

diff --git a/include/asm-generic/bitops.h b/include/asm-generic/bitops.h
index 0e6d985..c9f369c 100644 (file)
--- a/include/asm-generic/bitops.h
+++ b/include/asm-generic/bitops.h
@@ -5,78 +5,29 @@
  * For the benefit of those who are trying to port Linux to another
  * architecture, here are some C-language equivalents.  You should
  * recode these in the native assembly language, if at all possible.
- * To guarantee atomicity, these routines call cli() and sti() to
- * disable interrupts while they operate.  (You have to provide inline
- * routines to cli() and sti().)
- *
- * Also note, these routines assume that you have 32 bit longs.
- * You will have to change this if you are trying to port Linux to the
- * Alpha architecture or to a Cray.  :-)
  * 
  * C language equivalents written by Theodore Ts'o, 9/26/92
  */
 
-extern __inline__ int set_bit(int nr,long * addr)
-{
-       int     mask, retval;
-
-       addr += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       cli();
-       retval = (mask & *addr) != 0;
-       *addr |= mask;
-       sti();
-       return retval;
-}
-
-extern __inline__ int clear_bit(int nr, long * addr)
-{
-       int     mask, retval;
-
-       addr += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       cli();
-       retval = (mask & *addr) != 0;
-       *addr &= ~mask;
-       sti();
-       return retval;
-}
-
-extern __inline__ int test_bit(int nr, const unsigned long * addr)
-{
-       int     mask;
-
-       addr += nr >> 5;
-       mask = 1 << (nr & 0x1f);
-       return ((mask & *addr) != 0);
-}
-
-/*
- * fls: find last bit set.
- */
-
-#define fls(x) generic_fls(x)
-#define fls64(x)   generic_fls64(x)
-
-#ifdef __KERNEL__
-
-/*
- * ffs: find first bit set. This is defined the same way as
- * the libc and compiler builtin ffs routines, therefore
- * differs in spirit from the above ffz (man ffs).
- */
-
-#define ffs(x) generic_ffs(x)
-
-/*
- * hweightN: returns the hamming weight (i.e. the number
- * of bits set) of a N-bit word
- */
-
-#define hweight32(x) generic_hweight32(x)
-#define hweight16(x) generic_hweight16(x)
-#define hweight8(x) generic_hweight8(x)
-
-#endif /* __KERNEL__ */
+#include <asm-generic/bitops/atomic.h>
+#include <asm-generic/bitops/non-atomic.h>
+#include <asm-generic/bitops/__ffs.h>
+#include <asm-generic/bitops/ffz.h>
+#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/fls64.h>
+#include <asm-generic/bitops/find.h>
+
+#ifndef _LINUX_BITOPS_H
+#error only <linux/bitops.h> can be included directly
+#endif
+
+#include <asm-generic/bitops/sched.h>
+#include <asm-generic/bitops/ffs.h>
+#include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
+
+#include <asm-generic/bitops/ext2-non-atomic.h>
+#include <asm-generic/bitops/ext2-atomic.h>
+#include <asm-generic/bitops/minix.h>
 
 #endif /* _ASM_GENERIC_BITOPS_H */