From 9c6325dc3ac873cc03b8a2a0c1cbe855dba4d09e Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 1 Feb 2005 16:28:22 -0800 Subject: [PATCH] alpha: nodemask build fix nodemask.h wants find_next_zero_bit() to take a const address. Fix that up and modify find_next_bit() to suit. (These functions seem too big to be inlined...) Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- include/asm-alpha/bitops.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h index 87c43e519748..c9d69c99e470 100644 --- 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; -- cgit v1.2.3