projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm-dt-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
arch
/
m68k
/
include
/
asm
/
bitops.h
diff --git
a/arch/m68k/include/asm/bitops.h
b/arch/m68k/include/asm/bitops.h
index
51283db
..
87c2cd6
100644
(file)
--- a/
arch/m68k/include/asm/bitops.h
+++ b/
arch/m68k/include/asm/bitops.h
@@
-510,7
+510,7
@@
static inline int fls(unsigned int x)
return 32 - cnt;
}
-static inline
int __fls(int
x)
+static inline
unsigned long __fls(unsigned long
x)
{
return fls(x) - 1;
}