git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
arch
/
alpha
/
include
/
asm
/
bitops.h
diff --git
a/arch/alpha/include/asm/bitops.h
b/arch/alpha/include/asm/bitops.h
index ca43f4d0b93751b3cb262889fb638cf9c07a7011..5adca78830b5e9a3349e5fb410188b0eb98e3bd3 100644
(file)
--- a/
arch/alpha/include/asm/bitops.h
+++ b/
arch/alpha/include/asm/bitops.h
@@
-391,9
+391,9
@@
static inline unsigned long __fls(unsigned long x)
return fls64(x) - 1;
}
-static inline int fls(int x)
+static inline int fls(
unsigned
int x)
{
- return fls64(
(unsigned int)
x);
+ return fls64(x);
}
/*