diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-02-20 13:35:01 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-02-20 13:35:01 -0500 |
| commit | 84094b6acf34b8be93624fbce1adcda0692f55e6 (patch) | |
| tree | 3096c412e781fe43c35c2c5025568426266e11bf /include/asm-m32r/bitops.h | |
| parent | 1a997b0e788bf0310e25d5861e8460dfe6dcdb1c (diff) | |
| parent | 23bf8bba8519a2d1e4103a36860d96053c61efdd (diff) | |
Merge modernduck.com:/usr/src/bk/1394-2.6
into modernduck.com:/usr/src/bk/1394-dev
Diffstat (limited to 'include/asm-m32r/bitops.h')
| -rw-r--r-- | include/asm-m32r/bitops.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-m32r/bitops.h b/include/asm-m32r/bitops.h index dd8c7eb7263a..e78443981349 100644 --- a/include/asm-m32r/bitops.h +++ b/include/asm-m32r/bitops.h @@ -405,9 +405,10 @@ static __inline__ unsigned long ffz(unsigned long word) * @offset: The bitnumber to start searching at * @size: The maximum size to search */ -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 *) addr) + (offset >> 5); + const unsigned long *p = addr + (offset >> 5); unsigned long result = offset & ~31UL; unsigned long tmp; |