Merge branch 'lro'

[linux-2.6] / include / asm-cris / bitops.h

diff --git a/include/asm-cris/bitops.h b/include/asm-cris/bitops.h
index 1bddb3f3a289eddfa320a4519689c3081d9d1c0e..b7fef1572dc0f52d34ad9efa7eae87faf3ac684a 100644 (file)
--- a/include/asm-cris/bitops.h
+++ b/include/asm-cris/bitops.h
@@ -240,6 +240,7 @@ static inline int test_bit(int nr, const volatile unsigned long *addr)
  */
 
 #define fls(x) generic_fls(x)
+#define fls64(x)   generic_fls64(x)
 
 /*
  * hweightN - returns the hamming weight of a N-bit word
@@ -289,7 +290,7 @@ static inline int find_next_zero_bit (const unsigned long * addr, int size, int
        tmp = *p;
        
  found_first:
-       tmp |= ~0UL >> size;
+       tmp |= ~0UL << size;
  found_middle:
        return result + ffz(tmp);
 }