linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-h8300 / bitops.h

diff --git a/include/asm-h8300/bitops.h b/include/asm-h8300/bitops.h
index 9612371..ff7c2b7 100644 (file)
--- a/include/asm-h8300/bitops.h
+++ b/include/asm-h8300/bitops.h
@@ -196,7 +196,7 @@ static __inline__ unsigned long __ffs(unsigned long word)
        return result;
 }
 
-static __inline__ int find_next_zero_bit (void * addr, int size, int offset)
+static __inline__ int find_next_zero_bit (const unsigned long * addr, int size, int offset)
 {
        unsigned long *p = (unsigned long *)(((unsigned long)addr + (offset >> 3)) & ~3);
        unsigned long result = offset & ~31UL;
@@ -227,7 +227,7 @@ static __inline__ int find_next_zero_bit (void * addr, int size, int offset)
        tmp = *p;
 
 found_first:
-       tmp |= ~0UL >> size;
+       tmp |= ~0UL << size;
 found_middle:
        return result + ffz(tmp);
 }
@@ -406,5 +406,6 @@ found_middle:
 #endif /* __KERNEL__ */
 
 #define fls(x) generic_fls(x)
+#define fls64(x)   generic_fls64(x)
 
 #endif /* _H8300_BITOPS_H */