diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/asm-ppc/bitops.h | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/asm-ppc/bitops.h')
| -rw-r--r-- | include/asm-ppc/bitops.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ppc/bitops.h b/include/asm-ppc/bitops.h index 95b59cafc..c981d5fa0 100644 --- a/include/asm-ppc/bitops.h +++ b/include/asm-ppc/bitops.h @@ -1,5 +1,5 @@ /* - * $Id: bitops.h,v 1.11 1999/01/03 20:16:48 cort Exp $ + * $Id: bitops.h,v 1.12 2000/02/09 03:28:31 davem Exp $ * bitops.h: Bit string operations on the ppc */ @@ -88,11 +88,11 @@ extern __inline__ unsigned long change_bit(unsigned long nr, void *addr) } #endif -extern __inline__ unsigned long test_bit(int nr, __const__ volatile void *addr) +extern __inline__ int test_bit(int nr, __const__ volatile void *addr) { __const__ unsigned int *p = (__const__ unsigned int *) addr; - return (p[nr >> 5] >> (nr & 0x1f)) & 1UL; + return ((p[nr >> 5] >> (nr & 0x1f)) & 1) != 0; } extern __inline__ int ffz(unsigned int x) |