diff options
| author | Pete Popov <ppopov@embeddedalley.com> | 2005-07-14 00:16:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 19:31:49 +0100 |
| commit | 10f6567e63a0ba9b473da9ea60452ffdb07ced02 (patch) | |
| tree | e0fcb28865545f099a1b89b5f21df5a0fbe4fe57 /include/asm-mips/mach-au1x00/au1000.h | |
| parent | 7a0fc58cd9b004672b38537de276f8f188d5e84a (diff) | |
| download | linux-10f6567e63a0ba9b473da9ea60452ffdb07ced02.tar.gz linux-10f6567e63a0ba9b473da9ea60452ffdb07ced02.tar.bz2 linux-10f6567e63a0ba9b473da9ea60452ffdb07ced02.zip | |
Removed __ilog2 since it's no longer needed and conflicts with the
generic one.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips/mach-au1x00/au1000.h')
| -rw-r--r-- | include/asm-mips/mach-au1x00/au1000.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index cd6719cf5ede..8327ec341c18 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h @@ -90,29 +90,6 @@ static inline u32 au_readl(unsigned long reg) return (*(volatile u32 *)reg); } -/* These next three functions should be a generic part of the MIPS - * kernel (with the 'au_' removed from the name) and selected for - * processors that support the instructions. - * Taken from PPC tree. -- Dan - */ -/* Return the bit position of the most significant 1 bit in a word */ -static __inline__ int __ilog2(unsigned int x) -{ - int lz; - - asm volatile ( - ".set\tnoreorder\n\t" - ".set\tnoat\n\t" - ".set\tmips32\n\t" - "clz\t%0,%1\n\t" - ".set\tmips0\n\t" - ".set\tat\n\t" - ".set\treorder" - : "=r" (lz) - : "r" (x)); - - return 31 - lz; -} static __inline__ int au_ffz(unsigned int x) { |