---

yaml --- r: 231291 b: refs/heads/master c: e163d52 h: refs/heads/master i: 231289: 0ec77b7 231287: 065553f v: v3
git-mirror · Jan 12, 2011 · 201bf60 · 201bf60
1 parent 8f3c21a
commit 201bf60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22eeb8f6e0214a83ac6958a29a83572137f174bb
+refs/heads/master: e163d529ad7ab449db36ee88dab16170de711f34
diff --git a/trunk/arch/arm/include/asm/bitops.h b/trunk/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;
 }