sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

Correct ffs/fls regression for PowerPC etc 

Commits

  02f99901ed
  52d61227b6

introduced a regression where platform-specific ffs/fls implementations
were defined away. This patch corrects that by using PLATFORM_xxx
instead of the name itself.

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Simon Kagstrom 2009-09-17 15:15:52 +02:00 committed by Wolfgang Denk
parent 15fba3279b
commit 0413cfecea
11 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/asm-arm/bitops.h
View File

@ -124,14 +124,6 @@ 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

10
include/asm-blackfin/bitops.h
View File

@ -79,7 +79,7 @@ static __inline__ void __set_bit(int nr, volatile void *addr)
mask = 1 << (nr & 0x1f);
*a |= mask;
}
#define __set_bit
#define PLATFORM__SET_BIT
/*
* clear_bit() doesn't provide any barrier for the compiler.
@ -269,14 +269,6 @@ 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

2
include/asm-i386/bitops.h
View File

@ -349,7 +349,7 @@ static __inline__ int ffs(int x)
"1:" : "=r" (r) : "g" (x));
return r+1;
}
#define ffs
#define PLATFORM_FFS
/**
* hweightN - returns the hamming weight of a N-bit word

2
include/asm-m68k/bitops.h
View File

@ -51,7 +51,7 @@ extern __inline__ int ffs(int x)
return r;
}
#define __ffs(x) (ffs(x) - 1)
#define ffs
#define PLATFORM_FFS
#endif /* __KERNEL__ */

3
include/asm-microblaze/bitops.h
View File

@ -23,6 +23,7 @@ extern void __set_bit(int nr, volatile void * addr);
extern void clear_bit(int nr, volatile void * addr);
#define __clear_bit(nr, addr) clear_bit(nr, addr)
#define PLATFORM__CLEAR_BIT
extern void change_bit(int nr, volatile void * addr);
extern void __change_bit(int nr, volatile void * addr);
@ -75,7 +76,7 @@ extern __inline__ void __set_bit(int nr, volatile void * addr)
mask = 1 << (nr & 0x1f);
*a |= mask;
}
#define __set_bit
#define PLATFORM__SET_BIT
/*
* clear_bit() doesn't provide any barrier for the compiler.

13
include/asm-mips/bitops.h
View File

@ -90,7 +90,7 @@ static __inline__ void __set_bit(int nr, volatile void * addr)
*m |= 1UL << (nr & 31);
}
#define __set_bit
#define PLATFORM__SET_BIT
/*
* clear_bit - Clears a bit in memory
@ -706,17 +706,6 @@ static __inline__ unsigned long ffz(unsigned long word)
#ifdef __KERNEL__
/**
* ffs - find first bit set
* @x: the word to search
*
* 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 of a N-bit word
* @x: the word to weigh

2
include/asm-nios/bitops.h
View File

@ -33,6 +33,6 @@ extern int test_and_set_bit(int nr, volatile void * a);
extern int test_and_change_bit(int nr, volatile void * addr);
extern int test_bit(int nr, volatile void * a);
extern int ffs(int i);
#define ffs
#define PLATFORM_FFS
#endif /* _ASM_NIOS_BITOPS_H */

2
include/asm-nios2/bitops.h
View File

@ -33,6 +33,6 @@ extern int test_and_set_bit(int nr, volatile void * a);
extern int test_and_change_bit(int nr, volatile void * addr);
extern int test_bit(int nr, volatile void * a);
extern int ffs(int i);
#define ffs
#define PLATFORM_FFS
#endif /* __ASM_NIOS2_BITOPS_H */

4
include/asm-ppc/bitops.h
View File

@ -178,7 +178,7 @@ static __inline__ int fls(unsigned int x)
{
return __ilog2(x) + 1;
}
#define fls
#define PLATFORM_FLS
/**
* fls64 - find last set bit in a 64-bit word
@ -231,7 +231,7 @@ extern __inline__ int ffs(int x)
{
return __ilog2(x & -x) + 1;
}
#define ffs
#define PLATFORM_FFS
/*
* hweightN: returns the hamming weight (i.e. the number

2
include/asm-sh/bitops.h
View File

@ -146,7 +146,7 @@ static inline int ffs (int x)
}
return r;
}
#define ffs
#define PLATFORM_FFS
#endif /* __KERNEL__ */

8
include/linux/bitops.h
View File

@ -111,19 +111,19 @@ static inline unsigned int generic_hweight8(unsigned int w)
/* linux/include/asm-generic/bitops/non-atomic.h */
#ifndef __set_bit
#ifndef PLATFORM__SET_BIT
# define __set_bit generic_set_bit
#endif
#ifndef __clear_bit
#ifndef PLATFORM__CLEAR_BIT
# define __clear_bit generic_clear_bit
#endif
#ifndef ffs
#ifndef PLATFORM_FFS
# define ffs generic_ffs
#endif
#ifndef fls
#ifndef PLATFORM_FLS
# define fls generic_fls
#endif