diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 10:33:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-15 10:33:57 +1000 |
| commit | 4b0abee51fb45bd28126f16a9c836e67fbef48f8 (patch) | |
| tree | a203dd32aebb97737109fb58a82467afff67a1d4 /include | |
| parent | 254c59d1b3a88eb816315008111c2fcceb302783 (diff) | |
| parent | 534a419cc1f6ab41e4284fb4f9f507ee02828867 (diff) | |
Merge remote branch 'microblaze/next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/atomic.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h index 058129e9b04c..e53347fbf1da 100644 --- a/include/asm-generic/atomic.h +++ b/include/asm-generic/atomic.h @@ -57,11 +57,11 @@ static inline int atomic_add_return(int i, atomic_t *v) unsigned long flags; int temp; - local_irq_save(flags); + raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */ temp = v->counter; temp += i; v->counter = temp; - local_irq_restore(flags); + raw_local_irq_restore(flags); return temp; } @@ -78,11 +78,11 @@ static inline int atomic_sub_return(int i, atomic_t *v) unsigned long flags; int temp; - local_irq_save(flags); + raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */ temp = v->counter; temp -= i; v->counter = temp; - local_irq_restore(flags); + raw_local_irq_restore(flags); return temp; } @@ -135,9 +135,9 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) unsigned long flags; mask = ~mask; - local_irq_save(flags); + raw_local_irq_save(flags); /* Don't trace it in a irqsoff handler */ *addr &= mask; - local_irq_restore(flags); + raw_local_irq_restore(flags); } #define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v))) |