Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268937
b: refs/heads/master
c: cb475de
h: refs/heads/master
i:
  268935: 9d4fdc0
v: v3
  • Loading branch information
Yong Zhang authored and Thomas Gleixner committed Sep 14, 2011
1 parent 1af1cc5 commit 82e80d1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f59ca05871a055a73f8e626f2d868f0da248e22c
refs/heads/master: cb475de3d12df6912bc95048202ae8c280d4cad5
22 changes: 11 additions & 11 deletions trunk/lib/atomic64.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ static union {
char pad[L1_CACHE_BYTES];
} 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;

Expand All @@ -45,7 +45,7 @@ static inline spinlock_t *lock_addr(const atomic64_t *v)
long long atomic64_read(const atomic64_t *v)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);
long long val;

raw_spin_lock_irqsave(lock, flags);
Expand All @@ -58,7 +58,7 @@ EXPORT_SYMBOL(atomic64_read);
void atomic64_set(atomic64_t *v, long long i)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);

raw_spin_lock_irqsave(lock, flags);
v->counter = i;
Expand All @@ -69,7 +69,7 @@ EXPORT_SYMBOL(atomic64_set);
void atomic64_add(long long a, atomic64_t *v)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);

raw_spin_lock_irqsave(lock, flags);
v->counter += a;
Expand All @@ -80,7 +80,7 @@ EXPORT_SYMBOL(atomic64_add);
long long atomic64_add_return(long long a, atomic64_t *v)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);
long long val;

raw_spin_lock_irqsave(lock, flags);
Expand All @@ -93,7 +93,7 @@ EXPORT_SYMBOL(atomic64_add_return);
void atomic64_sub(long long a, atomic64_t *v)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);

raw_spin_lock_irqsave(lock, flags);
v->counter -= a;
Expand All @@ -104,7 +104,7 @@ EXPORT_SYMBOL(atomic64_sub);
long long atomic64_sub_return(long long a, atomic64_t *v)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);
long long val;

raw_spin_lock_irqsave(lock, flags);
Expand All @@ -117,7 +117,7 @@ EXPORT_SYMBOL(atomic64_sub_return);
long long atomic64_dec_if_positive(atomic64_t *v)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);
long long val;

raw_spin_lock_irqsave(lock, flags);
Expand All @@ -132,7 +132,7 @@ EXPORT_SYMBOL(atomic64_dec_if_positive);
long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);
long long val;

raw_spin_lock_irqsave(lock, flags);
Expand All @@ -147,7 +147,7 @@ EXPORT_SYMBOL(atomic64_cmpxchg);
long long atomic64_xchg(atomic64_t *v, long long new)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);
long long val;

raw_spin_lock_irqsave(lock, flags);
Expand All @@ -161,7 +161,7 @@ EXPORT_SYMBOL(atomic64_xchg);
int atomic64_add_unless(atomic64_t *v, long long a, long long u)
{
unsigned long flags;
spinlock_t *lock = lock_addr(v);
raw_spinlock_t *lock = lock_addr(v);
int ret = 0;

raw_spin_lock_irqsave(lock, flags);
Expand Down

0 comments on commit 82e80d1

Please sign in to comment.