From f53a046038939e673459d96f2fa058d6b702d1ca Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 9 Aug 2010 17:18:24 -0700 Subject: [PATCH] --- yaml --- r: 207190 b: refs/heads/master c: 9e58143dc08123c22c5b9f782b2913bd3a07a03d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-generic/atomic.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index dcf4d3a86c6c..5884c348744a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa260c00c1aa5c657793a7221e40d2400df5afd8 +refs/heads/master: 9e58143dc08123c22c5b9f782b2913bd3a07a03d diff --git a/trunk/include/asm-generic/atomic.h b/trunk/include/asm-generic/atomic.h index 058129e9b04c..e53347fbf1da 100644 --- a/trunk/include/asm-generic/atomic.h +++ b/trunk/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)))