Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Pete Popov and committed by
Ralf Baechle
10f6567e 7a0fc58c

-23
-23
include/asm-mips/mach-au1x00/au1000.h
··· 90 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 */ 99 - static __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 117 94 static __inline__ int au_ffz(unsigned int x) 118 95 {