diff --git a/[refs] b/[refs] index 98f8f3c68d17..cc3ae9f717db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2684927c6b938ec7a679891e0ec1fa0709c521bd +refs/heads/master: d89c145c0344fe2180336af6a309a59a8bc8c1c0 diff --git a/trunk/include/asm-i386/bitops.h b/trunk/include/asm-i386/bitops.h index 4807aa1d2e3d..26eb9811712f 100644 --- a/trunk/include/asm-i386/bitops.h +++ b/trunk/include/asm-i386/bitops.h @@ -332,9 +332,9 @@ static inline unsigned long __ffs(unsigned long word) * Returns the bit-number of the first set bit, not the number of the byte * containing a bit. */ -static inline int find_first_bit(const unsigned long *addr, unsigned size) +static inline unsigned find_first_bit(const unsigned long *addr, unsigned size) { - int x = 0; + unsigned x = 0; while (x < size) { unsigned long val = *addr++;