aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2011-01-12 14:38:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-12 14:22:25 +0000
commite163d529ad7ab449db36ee88dab16170de711f34 (patch)
treed930e21edf1b5992066a9734524218eaa1f4bd24 /arch/arm/include
parentARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is used (diff)
downloadlinux-dev-e163d529ad7ab449db36ee88dab16170de711f34.tar.xz
linux-dev-e163d529ad7ab449db36ee88dab16170de711f34.zip
ARM: 6621/1: bitops: remove condition code clobber for CLZ
The CLZ instruction does not alter the condition flags, so remove the "cc" clobber from the inline asm for fls(). Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/bitops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/bitops.h b/arch/arm/include/asm/bitops.h
index 338ff19ae447..7b1bb2bbaf88 100644
--- 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);
- asm("clz\t%0, %1" : "=r" (ret) : "r" (x) : "cc");
+ asm("clz\t%0, %1" : "=r" (ret) : "r" (x));
ret = 32 - ret;
return ret;
}