patch-2.3.43 linux/include/asm-alpha/bitops.h

• Lines: 45
• Date: Wed Feb 9 19:47:20 2000
• Orig file: v2.3.42/linux/include/asm-alpha/bitops.h
• Orig date: Tue Jun 22 10:46:52 1999

diff -u --recursive --new-file v2.3.42/linux/include/asm-alpha/bitops.h linux/include/asm-alpha/bitops.h
@@ -76,8 +76,8 @@
 	:"Ir" (1UL << (nr & 31)), "m" (*m));
 }
 
-extern __inline__ unsigned long test_and_set_bit(unsigned long nr,
-						 volatile void * addr)
+extern __inline__ int test_and_set_bit(unsigned long nr,
+				       volatile void * addr)
 {
 	unsigned long oldbit;
 	unsigned long temp;
@@ -101,8 +101,8 @@
 	return oldbit != 0;
 }
 
-extern __inline__ unsigned long test_and_clear_bit(unsigned long nr,
-						   volatile void * addr)
+extern __inline__ int test_and_clear_bit(unsigned long nr,
+					 volatile void * addr)
 {
 	unsigned long oldbit;
 	unsigned long temp;
@@ -126,8 +126,8 @@
 	return oldbit != 0;
 }
 
-extern __inline__ unsigned long test_and_change_bit(unsigned long nr,
-						    volatile void * addr)
+extern __inline__ int test_and_change_bit(unsigned long nr,
+					  volatile void * addr)
 {
 	unsigned long oldbit;
 	unsigned long temp;
@@ -149,9 +149,9 @@
 	return oldbit != 0;
 }
 
-extern __inline__ unsigned long test_bit(int nr, volatile void * addr)
+extern __inline__ int test_bit(int nr, volatile void * addr)
 {
-	return 1UL & (((const int *) addr)[nr >> 5] >> (nr & 31));
+	return (1UL & (((const int *) addr)[nr >> 5] >> (nr & 31))) != 0UL;
 }
 
 /*