|
@@ -29,7 +29,7 @@
|
|
* Ensure each lock is in a separate cacheline.
|
|
* Ensure each lock is in a separate cacheline.
|
|
*/
|
|
*/
|
|
static union {
|
|
static union {
|
|
- spinlock_t lock;
|
|
|
|
|
|
+ raw_spinlock_t lock;
|
|
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;
|
|
|
|
|
|
@@ -48,9 +48,9 @@ long long atomic64_read(const atomic64_t *v)
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
long long val;
|
|
long long val;
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
val = v->counter;
|
|
val = v->counter;
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
return val;
|
|
return val;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_read);
|
|
EXPORT_SYMBOL(atomic64_read);
|
|
@@ -60,9 +60,9 @@ void atomic64_set(atomic64_t *v, long long i)
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
v->counter = i;
|
|
v->counter = i;
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_set);
|
|
EXPORT_SYMBOL(atomic64_set);
|
|
|
|
|
|
@@ -71,9 +71,9 @@ void atomic64_add(long long a, atomic64_t *v)
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
v->counter += a;
|
|
v->counter += a;
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_add);
|
|
EXPORT_SYMBOL(atomic64_add);
|
|
|
|
|
|
@@ -83,9 +83,9 @@ long long atomic64_add_return(long long a, atomic64_t *v)
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
long long val;
|
|
long long val;
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
val = v->counter += a;
|
|
val = v->counter += a;
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
return val;
|
|
return val;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_add_return);
|
|
EXPORT_SYMBOL(atomic64_add_return);
|
|
@@ -95,9 +95,9 @@ void atomic64_sub(long long a, atomic64_t *v)
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
v->counter -= a;
|
|
v->counter -= a;
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_sub);
|
|
EXPORT_SYMBOL(atomic64_sub);
|
|
|
|
|
|
@@ -107,9 +107,9 @@ long long atomic64_sub_return(long long a, atomic64_t *v)
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
long long val;
|
|
long long val;
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
val = v->counter -= a;
|
|
val = v->counter -= a;
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
return val;
|
|
return val;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_sub_return);
|
|
EXPORT_SYMBOL(atomic64_sub_return);
|
|
@@ -120,11 +120,11 @@ long long atomic64_dec_if_positive(atomic64_t *v)
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
long long val;
|
|
long long val;
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
val = v->counter - 1;
|
|
val = v->counter - 1;
|
|
if (val >= 0)
|
|
if (val >= 0)
|
|
v->counter = val;
|
|
v->counter = val;
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
return val;
|
|
return val;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_dec_if_positive);
|
|
EXPORT_SYMBOL(atomic64_dec_if_positive);
|
|
@@ -135,11 +135,11 @@ long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n)
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
long long val;
|
|
long long val;
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
val = v->counter;
|
|
val = v->counter;
|
|
if (val == o)
|
|
if (val == o)
|
|
v->counter = n;
|
|
v->counter = n;
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
return val;
|
|
return val;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_cmpxchg);
|
|
EXPORT_SYMBOL(atomic64_cmpxchg);
|
|
@@ -150,10 +150,10 @@ long long atomic64_xchg(atomic64_t *v, long long new)
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
long long val;
|
|
long long val;
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
val = v->counter;
|
|
val = v->counter;
|
|
v->counter = new;
|
|
v->counter = new;
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
return val;
|
|
return val;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_xchg);
|
|
EXPORT_SYMBOL(atomic64_xchg);
|
|
@@ -164,12 +164,12 @@ int atomic64_add_unless(atomic64_t *v, long long a, long long u)
|
|
spinlock_t *lock = lock_addr(v);
|
|
spinlock_t *lock = lock_addr(v);
|
|
int ret = 0;
|
|
int ret = 0;
|
|
|
|
|
|
- spin_lock_irqsave(lock, flags);
|
|
|
|
|
|
+ raw_spin_lock_irqsave(lock, flags);
|
|
if (v->counter != u) {
|
|
if (v->counter != u) {
|
|
v->counter += a;
|
|
v->counter += a;
|
|
ret = 1;
|
|
ret = 1;
|
|
}
|
|
}
|
|
- spin_unlock_irqrestore(lock, flags);
|
|
|
|
|
|
+ raw_spin_unlock_irqrestore(lock, flags);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(atomic64_add_unless);
|
|
EXPORT_SYMBOL(atomic64_add_unless);
|
|
@@ -179,7 +179,7 @@ static int init_atomic64_lock(void)
|
|
int i;
|
|
int i;
|
|
|
|
|
|
for (i = 0; i < NR_LOCKS; ++i)
|
|
for (i = 0; i < NR_LOCKS; ++i)
|
|
- spin_lock_init(&atomic64_lock[i].lock);
|
|
|
|
|
|
+ raw_spin_lock_init(&atomic64_lock[i].lock);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|