From cb3f2e34c45e928205de8d37a8f21b36de5e2098 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 14 Aug 2008 20:29:51 -0500 Subject: Bitops:Remove generic_funcs Use asm-generic/bitops/xyz.h instead of using generic_xyz functions. Signed-off-by: Nishanth Menon --- arch/sandbox/Kconfig | 1 + include/asm-blackfin/bitops.h | 18 ++--------- include/asm-m68k/bitops.h | 18 ++--------- include/asm-ppc/bitops.h | 9 +----- include/asm-sandbox/bitops.h | 11 ++++++- include/linux/bitops.h | 71 +++++-------------------------------------- 6 files changed, 23 insertions(+), 105 deletions(-) diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index e079496155..36f8afb91d 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -9,6 +9,7 @@ config BOARDINFO config LINUX bool default y + select GENERIC_FIND_NEXT_BIT config ARCH_LINUX bool diff --git a/include/asm-blackfin/bitops.h b/include/asm-blackfin/bitops.h index 3ca4f7f521..39410de4e6 100644 --- a/include/asm-blackfin/bitops.h +++ b/include/asm-blackfin/bitops.h @@ -268,22 +268,8 @@ static __inline__ int find_next_zero_bit(void *addr, int size, int offset) return result + ffz(tmp); } -/* - * 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) +#include +#include static __inline__ int ext2_set_bit(int nr, volatile void *addr) { diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h index 9240b98b49..bfc3054155 100644 --- a/include/asm-m68k/bitops.h +++ b/include/asm-m68k/bitops.h @@ -122,22 +122,8 @@ static inline unsigned long ffz(unsigned long word) return k; } -/* - * 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) +#include +#include #define ext2_set_bit test_and_set_bit #define ext2_clear_bit test_and_clear_bit diff --git a/include/asm-ppc/bitops.h b/include/asm-ppc/bitops.h index 64da33a717..e83f0e90d2 100644 --- a/include/asm-ppc/bitops.h +++ b/include/asm-ppc/bitops.h @@ -178,14 +178,7 @@ extern __inline__ int ffs(int x) return __ilog2(x & -x) + 1; } -/* - * 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) +#include #endif /* __KERNEL__ */ diff --git a/include/asm-sandbox/bitops.h b/include/asm-sandbox/bitops.h index 8262154792..94646d4d0d 100644 --- a/include/asm-sandbox/bitops.h +++ b/include/asm-sandbox/bitops.h @@ -1,6 +1,15 @@ #ifndef _SANDBOX_BITOPS_H #define _SANDBOX_BITOPS_H -/* nothing */ +/* nothing but the defaults.. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/include/linux/bitops.h b/include/linux/bitops.h index 7d41ae62cc..e8ff23b6e0 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -1,70 +1,13 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H - -/* - * 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). - */ - -static inline int generic_ffs(int x) -{ - int r = 1; - - if (!x) - return 0; - if (!(x & 0xffff)) { - x >>= 16; - r += 16; - } - if (!(x & 0xff)) { - x >>= 8; - r += 8; - } - if (!(x & 0xf)) { - x >>= 4; - r += 4; - } - if (!(x & 3)) { - x >>= 2; - r += 2; - } - if (!(x & 1)) { - x >>= 1; - r += 1; - } - return r; -} - -/* - * hweightN: returns the hamming weight (i.e. the number - * of bits set) of a N-bit word - */ - -static inline unsigned int generic_hweight32(unsigned int w) -{ - unsigned int res = (w & 0x55555555) + ((w >> 1) & 0x55555555); - res = (res & 0x33333333) + ((res >> 2) & 0x33333333); - res = (res & 0x0F0F0F0F) + ((res >> 4) & 0x0F0F0F0F); - res = (res & 0x00FF00FF) + ((res >> 8) & 0x00FF00FF); - return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF); -} - -static inline unsigned int generic_hweight16(unsigned int w) -{ - unsigned int res = (w & 0x5555) + ((w >> 1) & 0x5555); - res = (res & 0x3333) + ((res >> 2) & 0x3333); - res = (res & 0x0F0F) + ((res >> 4) & 0x0F0F); - return (res & 0x00FF) + ((res >> 8) & 0x00FF); -} - -static inline unsigned int generic_hweight8(unsigned int w) -{ - unsigned int res = (w & 0x55) + ((w >> 1) & 0x55); - res = (res & 0x33) + ((res >> 2) & 0x33); - return (res & 0x0F) + ((res >> 4) & 0x0F); -} +#ifdef __U_BOOT__ +#define BIT(nr) (1UL << (nr)) +#define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) +#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) +#define BITS_PER_BYTE 8 +#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long)) +#endif #include -- cgit v1.2.3