patch-2.4.0-test3 linux/include/asm-arm/atomic.h

Next file: linux/include/asm-arm/bitops.h
Previous file: linux/include/asm-arm/arch-shark/ide.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/include/asm-arm/atomic.h linux/include/asm-arm/atomic.h
@@ -36,36 +36,36 @@
 {
 	unsigned long flags;
 
-	save_flags_cli (flags);
+	__save_flags_cli(flags);
 	v->counter += i;
-	restore_flags (flags);
+	__restore_flags(flags);
 }
 
 static __inline__ void atomic_sub(int i, volatile atomic_t *v)
 {
 	unsigned long flags;
 
-	save_flags_cli (flags);
+	__save_flags_cli(flags);
 	v->counter -= i;
-	restore_flags (flags);
+	__restore_flags(flags);
 }
 
 static __inline__ void atomic_inc(volatile atomic_t *v)
 {
 	unsigned long flags;
 
-	save_flags_cli (flags);
+	__save_flags_cli(flags);
 	v->counter += 1;
-	restore_flags (flags);
+	__restore_flags(flags);
 }
 
 static __inline__ void atomic_dec(volatile atomic_t *v)
 {
 	unsigned long flags;
 
-	save_flags_cli (flags);
+	__save_flags_cli(flags);
 	v->counter -= 1;
-	restore_flags (flags);
+	__restore_flags(flags);
 }
 
 static __inline__ int atomic_dec_and_test(volatile atomic_t *v)
@@ -73,10 +73,10 @@
 	unsigned long flags;
 	int result;
 
-	save_flags_cli (flags);
+	__save_flags_cli(flags);
 	v->counter -= 1;
 	result = (v->counter == 0);
-	restore_flags (flags);
+	__restore_flags(flags);
 
 	return result;
 }
@@ -86,10 +86,10 @@
 	unsigned long flags;
 	int result;
 
-	save_flags_cli(flags);
+	__save_flags_cli(flags);
 	v->counter += i;
 	result = (v->counter < 0);
-	restore_flags(flags);
+	__restore_flags(flags);
 
 	return result;
 }
@@ -98,9 +98,9 @@
 {
 	unsigned long flags;
 
-	save_flags_cli (flags);
+	__save_flags_cli(flags);
 	*addr &= ~mask;
-	restore_flags (flags);
+	__restore_flags(flags);
 }
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)