patch-2.4.20 linux-2.4.20/include/asm-mips/atomic.h
Next file: linux-2.4.20/include/asm-mips/au1000.h
Previous file: linux-2.4.20/include/asm-mips/asmmacro.h
Back to the patch index
Back to the overall index
- Lines: 53
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/include/asm-mips/atomic.h
- Orig date:
Fri Aug 2 17:39:45 2002
diff -urN linux-2.4.19/include/asm-mips/atomic.h linux-2.4.20/include/asm-mips/atomic.h
@@ -57,10 +57,9 @@
*/
extern __inline__ void atomic_add(int i, atomic_t * v)
{
- int flags;
+ unsigned long flags;
- save_flags(flags);
- cli();
+ save_and_cli(flags);
v->counter += i;
restore_flags(flags);
}
@@ -75,20 +74,19 @@
*/
extern __inline__ void atomic_sub(int i, atomic_t * v)
{
- int flags;
+ unsigned long flags;
- save_flags(flags);
- cli();
+ save_and_cli(flags);
v->counter -= i;
restore_flags(flags);
}
extern __inline__ int atomic_add_return(int i, atomic_t * v)
{
- int temp, flags;
+ unsigned long flags;
+ int temp;
- save_flags(flags);
- cli();
+ save_and_cli(flags);
temp = v->counter;
temp += i;
v->counter = temp;
@@ -99,10 +97,10 @@
extern __inline__ int atomic_sub_return(int i, atomic_t * v)
{
- int temp, flags;
+ unsigned long flags;
+ int temp;
- save_flags(flags);
- cli();
+ save_and_cli(flags);
temp = v->counter;
temp -= i;
v->counter = temp;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)