Use the asm-generic/bitops/xyz.h instead of using generic_xyz functions.
Signed-off-by: Nishanth Menon x0nishan@ti.com
--- include/asm-blackfin/bitops.h | 18 +--------- include/asm-m68k/bitops.h | 18 +--------- include/asm-ppc/bitops.h | 9 ----- include/linux/bitops.h | 71 ++++-------------------------------------- 4 files changed, 12 insertions(+), 104 deletions(-)
Index: u-boot-v2.git/include/asm-blackfin/bitops.h =================================================================== --- u-boot-v2.git.orig/include/asm-blackfin/bitops.h 2008-06-19 00:50:37.000000000 -0500 +++ u-boot-v2.git/include/asm-blackfin/bitops.h 2008-06-19 00:51:52.000000000 -0500 @@ -268,22 +268,8 @@ 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 <asm-generic/bitops/ffs.h> +#include <asm-generic/bitops/hweight.h>
static __inline__ int ext2_set_bit(int nr, volatile void *addr) { Index: u-boot-v2.git/include/asm-m68k/bitops.h =================================================================== --- u-boot-v2.git.orig/include/asm-m68k/bitops.h 2008-06-19 00:50:13.000000000 -0500 +++ u-boot-v2.git/include/asm-m68k/bitops.h 2008-06-19 00:51:52.000000000 -0500 @@ -122,22 +122,8 @@ 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 <asm-generic/bitops/ffs.h> +#include <asm-generic/bitops/hweight.h>
#define ext2_set_bit test_and_set_bit #define ext2_clear_bit test_and_clear_bit Index: u-boot-v2.git/include/linux/bitops.h =================================================================== --- u-boot-v2.git.orig/include/linux/bitops.h 2008-06-19 00:50:13.000000000 -0500 +++ u-boot-v2.git/include/linux/bitops.h 2008-06-19 00:52:34.000000000 -0500 @@ -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 <asm/bitops.h>
Index: u-boot-v2.git/include/asm-ppc/bitops.h =================================================================== --- u-boot-v2.git.orig/include/asm-ppc/bitops.h 2008-06-19 00:50:37.000000000 -0500 +++ u-boot-v2.git/include/asm-ppc/bitops.h 2008-06-19 00:51:52.000000000 -0500 @@ -178,14 +178,7 @@ 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 <asm-generic/bitops/hweight.h>
#endif /* __U_BOOT__ */