projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
arch
/
xtensa
/
include
/
asm
/
bitops.h
diff --git
a/arch/xtensa/include/asm/bitops.h
b/arch/xtensa/include/asm/bitops.h
index
3f44fa2
..
d349018
100644
(file)
--- a/
arch/xtensa/include/asm/bitops.h
+++ b/
arch/xtensa/include/asm/bitops.h
@@
-48,7
+48,7
@@
static inline int ffz(unsigned long x)
* __ffs: Find first bit set in word. Return 0 for bit 0
*/
-static inline
int
__ffs(unsigned long x)
+static inline
unsigned long
__ffs(unsigned long x)
{
return 31 - __cntlz(x & -x);
}