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

Commit cb475de3 authored by Yong Zhang's avatar Yong Zhang Committed by Thomas Gleixner
Browse files

lib: atomic64: Change the type of local lock to raw_spinlock_t 



There are still some leftovers of commit f59ca058
[locking, lib/atomic64: Annotate atomic64_lock::lock as raw]

[ tglx: Seems I picked the wrong version of that patch :( ]

Signed-off-by: default avatarYong Zhang <yong.zhang0@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shan Hai <haishan.bai@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Link: http://lkml.kernel.org/r/20110914074924.GA16096@zhy


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f59ca058

lib/atomic64.c

+11 −11
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ static union { 
	char pad[L1_CACHE_BYTES];

	char pad[L1_CACHE_BYTES];

} atomic64_lock[NR_LOCKS] __cacheline_aligned_in_smp;

} atomic64_lock[NR_LOCKS] __cacheline_aligned_in_smp;





static inline spinlock_t *lock_addr(const atomic64_t *v)

static inline raw_spinlock_t *lock_addr(const atomic64_t *v)

{

{

	unsigned long addr = (unsigned long) v;

	unsigned long addr = (unsigned long) v;
@@ -45,7 +45,7 @@ static inline spinlock_t *lock_addr(const atomic64_t *v) 
long long atomic64_read(const atomic64_t *v)

long long atomic64_read(const atomic64_t *v)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);

	long long val;

	long long val;





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);
@@ -58,7 +58,7 @@ EXPORT_SYMBOL(atomic64_read); 
void atomic64_set(atomic64_t *v, long long i)

void atomic64_set(atomic64_t *v, long long i)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);

	v->counter = i;

	v->counter = i;
@@ -69,7 +69,7 @@ EXPORT_SYMBOL(atomic64_set); 
void atomic64_add(long long a, atomic64_t *v)

void atomic64_add(long long a, atomic64_t *v)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);

	v->counter += a;

	v->counter += a;
@@ -80,7 +80,7 @@ EXPORT_SYMBOL(atomic64_add); 
long long atomic64_add_return(long long a, atomic64_t *v)

long long atomic64_add_return(long long a, atomic64_t *v)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);

	long long val;

	long long val;





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);
@@ -93,7 +93,7 @@ EXPORT_SYMBOL(atomic64_add_return); 
void atomic64_sub(long long a, atomic64_t *v)

void atomic64_sub(long long a, atomic64_t *v)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);

	v->counter -= a;

	v->counter -= a;
@@ -104,7 +104,7 @@ EXPORT_SYMBOL(atomic64_sub); 
long long atomic64_sub_return(long long a, atomic64_t *v)

long long atomic64_sub_return(long long a, atomic64_t *v)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);

	long long val;

	long long val;





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);
@@ -117,7 +117,7 @@ EXPORT_SYMBOL(atomic64_sub_return); 
long long atomic64_dec_if_positive(atomic64_t *v)

long long atomic64_dec_if_positive(atomic64_t *v)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);

	long long val;

	long long val;





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);
@@ -132,7 +132,7 @@ EXPORT_SYMBOL(atomic64_dec_if_positive); 
long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n)

long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);

	long long val;

	long long val;





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);
@@ -147,7 +147,7 @@ EXPORT_SYMBOL(atomic64_cmpxchg); 
long long atomic64_xchg(atomic64_t *v, long long new)

long long atomic64_xchg(atomic64_t *v, long long new)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);

	long long val;

	long long val;





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);
@@ -161,7 +161,7 @@ EXPORT_SYMBOL(atomic64_xchg); 
int atomic64_add_unless(atomic64_t *v, long long a, long long u)

int atomic64_add_unless(atomic64_t *v, long long a, long long u)

{

{

	unsigned long flags;

	unsigned long flags;

	spinlock_t *lock = lock_addr(v);

	raw_spinlock_t *lock = lock_addr(v);

	int ret = 0;

	int ret = 0;





	raw_spin_lock_irqsave(lock, flags);

	raw_spin_lock_irqsave(lock, flags);