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

Next file: linux/include/asm-alpha/cia.h
Previous file: linux/include/asm-alpha/apecs.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.91/linux/include/asm-alpha/bitops.h linux/include/asm-alpha/bitops.h
@@ -17,7 +17,7 @@
  * bit 0 is the LSB of addr; bit 64 is the LSB of (addr+1).
  */
 
-extern __inline__ void set_bit(unsigned long nr, void * addr)
+extern __inline__ void set_bit(unsigned long nr, volatile void * addr)
 {
 	unsigned long oldbit;
 	unsigned long temp;
@@ -38,7 +38,7 @@
 	:"Ir" (1UL << (nr & 31)), "m" (*m));
 }
 
-extern __inline__ void clear_bit(unsigned long nr, void * addr)
+extern __inline__ void clear_bit(unsigned long nr, volatile void * addr)
 {
 	unsigned long oldbit;
 	unsigned long temp;
@@ -59,7 +59,7 @@
 	:"Ir" (1UL << (nr & 31)), "m" (*m));
 }
 
-extern __inline__ void change_bit(unsigned long nr, void * addr)
+extern __inline__ void change_bit(unsigned long nr, volatile void * addr)
 {
 	unsigned long temp;
 	unsigned int * m = ((unsigned int *) addr) + (nr >> 5);
@@ -76,7 +76,8 @@
 	:"Ir" (1UL << (nr & 31)), "m" (*m));
 }
 
-extern __inline__ unsigned long test_and_set_bit(unsigned long nr, void * addr)
+extern __inline__ unsigned long test_and_set_bit(unsigned long nr,
+						 volatile void * addr)
 {
 	unsigned long oldbit;
 	unsigned long temp;
@@ -99,7 +100,8 @@
 	return oldbit != 0;
 }
 
-extern __inline__ unsigned long test_and_clear_bit(unsigned long nr, void * addr)
+extern __inline__ unsigned long test_and_clear_bit(unsigned long nr,
+						   volatile void * addr)
 {
 	unsigned long oldbit;
 	unsigned long temp;
@@ -122,7 +124,8 @@
 	return oldbit != 0;
 }
 
-extern __inline__ unsigned long test_and_change_bit(unsigned long nr, void * addr)
+extern __inline__ unsigned long test_and_change_bit(unsigned long nr,
+						    volatile void * addr)
 {
 	unsigned long oldbit;
 	unsigned long temp;
@@ -143,7 +146,7 @@
 	return oldbit != 0;
 }
 
-extern __inline__ unsigned long test_bit(int nr, const void * addr)
+extern __inline__ unsigned long test_bit(int nr, volatile void * addr)
 {
 	return 1UL & (((const int *) addr)[nr >> 5] >> (nr & 31));
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov