aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mips
diff options
context:
space:
mode:
authorPete Popov <ppopov@embeddedalley.com>2005-07-13 20:16:06 -0400
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 14:31:49 -0400
commit10f6567e63a0ba9b473da9ea60452ffdb07ced02 (patch)
treee0fcb28865545f099a1b89b5f21df5a0fbe4fe57 /include/asm-mips
parent7a0fc58cd9b004672b38537de276f8f188d5e84a (diff)
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')
-rw-r--r--include/asm-mips/mach-au1x00/au1000.h23
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)
90 return (*(volatile u32 *)reg); 90 return (*(volatile u32 *)reg);
91} 91}
92 92
93/* These next three functions should be a generic part of the MIPS
94 * kernel (with the 'au_' removed from the name) and selected for
95 * processors that support the instructions.
96 * Taken from PPC tree. -- Dan
97 */
98/* Return the bit position of the most significant 1 bit in a word */
99static __inline__ int __ilog2(unsigned int x)
100{
101 int lz;
102
103 asm volatile (
104 ".set\tnoreorder\n\t"
105 ".set\tnoat\n\t"
106 ".set\tmips32\n\t"
107 "clz\t%0,%1\n\t"
108 ".set\tmips0\n\t"
109 ".set\tat\n\t"
110 ".set\treorder"
111 : "=r" (lz)
112 : "r" (x));
113
114 return 31 - lz;
115}
116 93
117static __inline__ int au_ffz(unsigned int x) 94static __inline__ int au_ffz(unsigned int x)
118{ 95{