diff options
| author | Simon Kagstrom <simon.kagstrom@netinsight.net> | 2009-09-17 15:15:52 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-17 22:45:31 +0200 |
| commit | 0413cfecea350000eab5e591a0965c3e3ee0ff00 (patch) | |
| tree | 5375713a0a077db87d0d222ce591800f768a2ca5 /include/asm-mips | |
| parent | 15fba3279b56333bdb65ead366f82c945ed320d1 (diff) | |
Correct ffs/fls regression for PowerPC etc
Commits
02f99901ed1c9d828e3ea117f94ce2264bf8389e
52d61227b66d4099b39c8309ab37cb67ee09a405
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>
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/bitops.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index 0c07b686a..1c8f4c050 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h @@ -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 |