luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

m68k/bitops: convert __ffs to match generic declaration

Browse Source 
The generic bitops declare __ffs as

	static inline unsigned long __ffs(unsigned long word);

Convert the m68k version to match the generic declaration.

Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Mike Rapoport 2018-07-04 09:28:14 +03:00 committed by Geert Uytterhoeven
parent 781c4d6f5f
commit 384052e4ed
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/m68k/include/asm/bitops.h
View File

@ -454,7 +454,7 @@ static inline unsigned long ffz(unsigned long word)
*/ */
#if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \ #if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \
!defined(CONFIG_M68000) && !defined(CONFIG_MCPU32) !defined(CONFIG_M68000) && !defined(CONFIG_MCPU32)
static inline int __ffs(int x) static inline unsigned long __ffs(unsigned long x)
{ {
__asm__ __volatile__ ("bitrev %0; ff1 %0" __asm__ __volatile__ ("bitrev %0; ff1 %0"
: "=d" (x) : "=d" (x)
@ -493,7 +493,11 @@ static inline int ffs(int x)
: "dm" (x & -x)); : "dm" (x & -x));
return 32 - cnt; return 32 - cnt;
} }
#define __ffs(x) (ffs(x) - 1)
static inline unsigned long __ffs(unsigned long x)
{
return ffs(x) - 1;
}
/* /*
* fls: find last bit set. * fls: find last bit set.