diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /include/asm-s390/bitops.h | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-s390/bitops.h')
| -rw-r--r-- | include/asm-s390/bitops.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h index 8651524217fd..b07c578b22ea 100644 --- a/include/asm-s390/bitops.h +++ b/include/asm-s390/bitops.h | |||
| @@ -518,8 +518,8 @@ static inline int __test_bit(unsigned long nr, const volatile unsigned long *ptr | |||
| 518 | 518 | ||
| 519 | static inline int | 519 | static inline int |
| 520 | __constant_test_bit(unsigned long nr, const volatile unsigned long *addr) { | 520 | __constant_test_bit(unsigned long nr, const volatile unsigned long *addr) { |
| 521 | return (((volatile char *) addr) | 521 | return ((((volatile char *) addr) |
| 522 | [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7))); | 522 | [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7)))) != 0; |
| 523 | } | 523 | } |
| 524 | 524 | ||
| 525 | #define test_bit(nr,addr) \ | 525 | #define test_bit(nr,addr) \ |