CVS Update@linux-mips.org: linux

[ppopov@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ppopov@ftp.linux-mips.org       05/07/14 01:16:06

Modified files:
        include/asm-mips/mach-au1x00: au1000.h 

Log message:
        Removed __ilog2 since it's no longer needed and conflicts with
        the generic one.

diff -urN linux/include/asm-mips/mach-au1x00/au1000.h 
linux/include/asm-mips/mach-au1x00/au1000.h
--- linux/include/asm-mips/mach-au1x00/au1000.h 2005/04/21 05:31:59     1.17
+++ linux/include/asm-mips/mach-au1x00/au1000.h 2005/07/14 00:16:06     1.18
@@ -90,29 +90,6 @@
        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)
 {