git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
bitops.h
diff --git
a/arch/arm/include/asm/bitops.h
b/arch/arm/include/asm/bitops.h
index
338ff19
..
7b1bb2b
100644
(file)
--- a/
arch/arm/include/asm/bitops.h
+++ b/
arch/arm/include/asm/bitops.h
@@
-285,7
+285,7
@@
static inline int fls(int x)
if (__builtin_constant_p(x))
return constant_fls(x);
if (__builtin_constant_p(x))
return constant_fls(x);
- asm("clz\t%0, %1" : "=r" (ret) : "r" (x)
: "cc"
);
+ asm("clz\t%0, %1" : "=r" (ret) : "r" (x));
ret = 32 - ret;
return ret;
}
ret = 32 - ret;
return ret;
}