vserver 1.9.5.x5

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

diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h
index 87c43e5..c9d69c9 100644 (file)
--- a/include/asm-alpha/bitops.h
+++ b/include/asm-alpha/bitops.h
@@ -376,12 +376,13 @@ static inline unsigned long hweight64(unsigned long w)
  * Find next zero bit in a bitmap reasonably efficiently..
  */
 static inline unsigned long
-find_next_zero_bit(void * addr, unsigned long size, unsigned long offset)
+find_next_zero_bit(const void *addr, unsigned long size, unsigned long offset)
 {
-       unsigned long * p = ((unsigned long *) addr) + (offset >> 6);
+       const unsigned long *p = addr;
        unsigned long result = offset & ~63UL;
        unsigned long tmp;
 
+       p += offset >> 6;
        if (offset >= size)
                return size;
        size -= result;
@@ -419,10 +420,11 @@ find_next_zero_bit(void * addr, unsigned long size, unsigned long offset)
 static inline unsigned long
 find_next_bit(const void * addr, unsigned long size, unsigned long offset)
 {
-       const unsigned long * p = ((const unsigned long *) addr) + (offset >> 6);
+       const unsigned long *p = addr;
        unsigned long result = offset & ~63UL;
        unsigned long tmp;
 
+       p += offset >> 6;
        if (offset >= size)
                return size;
        size -= result;