sh: Make the atomic functions safe for irqsoff tracing
The irqsoff tracer uses the atomic_* functions internally, but the implementations of those functions in arch/sh/include/asm/atomic-irq.h disable irqs to achieve atomicity. A continuous loop ensues where we disable interrupts, trace the interrupt disabling, call atomic_* functions, disable interrupts, trace the interrupt disabling, etc.. The simplest solution to all this is to just convert uses of local_irq_save()/local_irq_restore() the raw_* equivalents because the raw_* equivalents don't call trace_hardirqs_on()/trace_hardirqs_off(). Signed-off-by: Matt Fleming <matt@console-pimps.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
3767f3f1ee
commit
0c50f6f383
|
@ -10,29 +10,29 @@ static inline void atomic_add(int i, atomic_t *v)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
local_irq_save(flags);
|
raw_local_irq_save(flags);
|
||||||
v->counter += i;
|
v->counter += i;
|
||||||
local_irq_restore(flags);
|
raw_local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void atomic_sub(int i, atomic_t *v)
|
static inline void atomic_sub(int i, atomic_t *v)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
local_irq_save(flags);
|
raw_local_irq_save(flags);
|
||||||
v->counter -= i;
|
v->counter -= i;
|
||||||
local_irq_restore(flags);
|
raw_local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int atomic_add_return(int i, atomic_t *v)
|
static inline int atomic_add_return(int i, atomic_t *v)
|
||||||
{
|
{
|
||||||
unsigned long temp, flags;
|
unsigned long temp, flags;
|
||||||
|
|
||||||
local_irq_save(flags);
|
raw_local_irq_save(flags);
|
||||||
temp = v->counter;
|
temp = v->counter;
|
||||||
temp += i;
|
temp += i;
|
||||||
v->counter = temp;
|
v->counter = temp;
|
||||||
local_irq_restore(flags);
|
raw_local_irq_restore(flags);
|
||||||
|
|
||||||
return temp;
|
return temp;
|
||||||
}
|
}
|
||||||
|
@ -41,11 +41,11 @@ static inline int atomic_sub_return(int i, atomic_t *v)
|
||||||
{
|
{
|
||||||
unsigned long temp, flags;
|
unsigned long temp, flags;
|
||||||
|
|
||||||
local_irq_save(flags);
|
raw_local_irq_save(flags);
|
||||||
temp = v->counter;
|
temp = v->counter;
|
||||||
temp -= i;
|
temp -= i;
|
||||||
v->counter = temp;
|
v->counter = temp;
|
||||||
local_irq_restore(flags);
|
raw_local_irq_restore(flags);
|
||||||
|
|
||||||
return temp;
|
return temp;
|
||||||
}
|
}
|
||||||
|
@ -54,18 +54,18 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
local_irq_save(flags);
|
raw_local_irq_save(flags);
|
||||||
v->counter &= ~mask;
|
v->counter &= ~mask;
|
||||||
local_irq_restore(flags);
|
raw_local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
|
static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
local_irq_save(flags);
|
raw_local_irq_save(flags);
|
||||||
v->counter |= mask;
|
v->counter |= mask;
|
||||||
local_irq_restore(flags);
|
raw_local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* __ASM_SH_ATOMIC_IRQ_H */
|
#endif /* __ASM_SH_ATOMIC_IRQ_H */
|
||||||
|
|
Loading…
Reference in New Issue