From: Rabin Vincent <rabin@rab.in>
Date: Wed, 12 Jan 2011 13:38:52 +0000 (+0100)
Subject: ARM: 6621/1: bitops: remove condition code clobber for CLZ
X-Git-Tag: v2.6.38-rc1~39^2~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e163d529ad7ab449db36ee88dab16170de711f34;p=linux-2.6-block.git

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>
---

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;
 }