X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Fbitops.h;h=994e0aeffd5bfa0d92c87c39f5ce4ae169613f4d;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=5f1c975e04becc52cbc89d5f7ff9f342db007f7e;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git

diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index 5f1c975e0..994e0aeff 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -345,7 +345,7 @@ static inline unsigned long __ffs(unsigned long word)
 extern __inline__ int generic_fls(int x);
 #define fls(x) \
 	( __builtin_constant_p(x) ? generic_fls(x) : \
-	  ({ int __r; asm("clz%?\t%0, %1" : "=r"(__r) : "r"(x)); 32-__r; }) )
+	  ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )
 #define ffs(x) ({ unsigned long __t = (x); fls(__t & -__t); })
 #define __ffs(x) (ffs(x) - 1)
 #define ffz(x) __ffs( ~(x) )