diff options
Diffstat (limited to 'include/asm-mips/system.h')
| -rw-r--r-- | include/asm-mips/system.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index 597a3743f6a1..290887077e44 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h | |||
| @@ -121,10 +121,10 @@ static inline unsigned long __xchg_u32(volatile int * m, unsigned int val) | |||
| 121 | } else { | 121 | } else { |
| 122 | unsigned long flags; | 122 | unsigned long flags; |
| 123 | 123 | ||
| 124 | local_irq_save(flags); | 124 | raw_local_irq_save(flags); |
| 125 | retval = *m; | 125 | retval = *m; |
| 126 | *m = val; | 126 | *m = val; |
| 127 | local_irq_restore(flags); /* implies memory barrier */ | 127 | raw_local_irq_restore(flags); /* implies memory barrier */ |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | smp_mb(); | 130 | smp_mb(); |
| @@ -169,10 +169,10 @@ static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val) | |||
| 169 | } else { | 169 | } else { |
| 170 | unsigned long flags; | 170 | unsigned long flags; |
| 171 | 171 | ||
| 172 | local_irq_save(flags); | 172 | raw_local_irq_save(flags); |
| 173 | retval = *m; | 173 | retval = *m; |
| 174 | *m = val; | 174 | *m = val; |
| 175 | local_irq_restore(flags); /* implies memory barrier */ | 175 | raw_local_irq_restore(flags); /* implies memory barrier */ |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | smp_mb(); | 178 | smp_mb(); |
| @@ -250,11 +250,11 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old, | |||
| 250 | } else { | 250 | } else { |
| 251 | unsigned long flags; | 251 | unsigned long flags; |
| 252 | 252 | ||
| 253 | local_irq_save(flags); | 253 | raw_local_irq_save(flags); |
| 254 | retval = *m; | 254 | retval = *m; |
| 255 | if (retval == old) | 255 | if (retval == old) |
| 256 | *m = new; | 256 | *m = new; |
| 257 | local_irq_restore(flags); /* implies memory barrier */ | 257 | raw_local_irq_restore(flags); /* implies memory barrier */ |
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | smp_mb(); | 260 | smp_mb(); |
| @@ -304,11 +304,11 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old, | |||
| 304 | } else { | 304 | } else { |
| 305 | unsigned long flags; | 305 | unsigned long flags; |
| 306 | 306 | ||
| 307 | local_irq_save(flags); | 307 | raw_local_irq_save(flags); |
| 308 | retval = *m; | 308 | retval = *m; |
| 309 | if (retval == old) | 309 | if (retval == old) |
| 310 | *m = new; | 310 | *m = new; |
| 311 | local_irq_restore(flags); /* implies memory barrier */ | 311 | raw_local_irq_restore(flags); /* implies memory barrier */ |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | smp_mb(); | 314 | smp_mb(); |
