Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dd5c845 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3810/1: switch atomic helpers over to raw_local_irq_{save,restore} 



Now that we have raw_* variants of local_irq_$FOO(), switch the atomic
helpers over to use those raw_* variants.  This is necessary when using
lockdep on pre-ARMv6 hardware, as lockdep uses atomic_t counters in the
trace_hardirqs_off() path.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 34148c69

include/asm-arm/atomic.h

+8 −8
Original line number Diff line number Diff line
@@ -128,10 +128,10 @@ static inline int atomic_add_return(int i, atomic_t *v) 
	unsigned long flags;

	int val;



	local_irq_save(flags);

	raw_local_irq_save(flags);

	val = v->counter;

	v->counter = val += i;

	local_irq_restore(flags);

	raw_local_irq_restore(flags);



	return val;

}
@@ -141,10 +141,10 @@ static inline int atomic_sub_return(int i, atomic_t *v) 
	unsigned long flags;

	int val;



	local_irq_save(flags);

	raw_local_irq_save(flags);

	val = v->counter;

	v->counter = val -= i;

	local_irq_restore(flags);

	raw_local_irq_restore(flags);



	return val;

}
@@ -154,11 +154,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new) 
	int ret;

	unsigned long flags;



	local_irq_save(flags);

	raw_local_irq_save(flags);

	ret = v->counter;

	if (likely(ret == old))

		v->counter = new;

	local_irq_restore(flags);

	raw_local_irq_restore(flags);



	return ret;

}
@@ -167,9 +167,9 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) 
{

	unsigned long flags;



	local_irq_save(flags);

	raw_local_irq_save(flags);

	*addr &= ~mask;

	local_irq_restore(flags);

	raw_local_irq_restore(flags);

}



#endif /* __LINUX_ARM_ARCH__ */