aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2011-01-12 08:38:52 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-12 09:22:25 -0500
commite163d529ad7ab449db36ee88dab16170de711f34 (patch)
treed930e21edf1b5992066a9734524218eaa1f4bd24
parent22eeb8f6e0214a83ac6958a29a83572137f174bb (diff)
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>
-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)
285 if (__builtin_constant_p(x)) 285 if (__builtin_constant_p(x))
286 return constant_fls(x); 286 return constant_fls(x);
287 287
288 asm("clz\t%0, %1" : "=r" (ret) : "r" (x) : "cc"); 288 asm("clz\t%0, %1" : "=r" (ret) : "r" (x));
289 ret = 32 - ret; 289 ret = 32 - ret;
290 return ret; 290 return ret;
291} 291}