git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dma-debug: allow DMA_BIDIRECTIONAL mappings to be synced with DMA_FROM_DEVICE and
[safe/jmp/linux-2.6]
/
lib
/
spinlock_debug.c
diff --git
a/lib/spinlock_debug.c
b/lib/spinlock_debug.c
index
f730041
..
4755b98
100644
(file)
--- a/
lib/spinlock_debug.c
+++ b/
lib/spinlock_debug.c
@@
-13,8
+13,8
@@
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/module.h>
-void __
spin_lock_init(
spinlock_t *lock, const char *name,
- struct lock_class_key *key)
+void __
raw_spin_lock_init(raw_
spinlock_t *lock, const char *name,
+
struct lock_class_key *key)
{
#ifdef CONFIG_DEBUG_LOCK_ALLOC
/*
{
#ifdef CONFIG_DEBUG_LOCK_ALLOC
/*
@@
-29,7
+29,7
@@
void __spin_lock_init(spinlock_t *lock, const char *name,
lock->owner_cpu = -1;
}
lock->owner_cpu = -1;
}
-EXPORT_SYMBOL(__spin_lock_init);
+EXPORT_SYMBOL(__
raw_
spin_lock_init);
void __rwlock_init(rwlock_t *lock, const char *name,
struct lock_class_key *key)
void __rwlock_init(rwlock_t *lock, const char *name,
struct lock_class_key *key)
@@
-41,7
+41,7
@@
void __rwlock_init(rwlock_t *lock, const char *name,
debug_check_no_locks_freed((void *)lock, sizeof(*lock));
lockdep_init_map(&lock->dep_map, name, key, 0);
#endif
debug_check_no_locks_freed((void *)lock, sizeof(*lock));
lockdep_init_map(&lock->dep_map, name, key, 0);
#endif
- lock->raw_lock = (
raw_rwlock_t) __RAW
_RW_LOCK_UNLOCKED;
+ lock->raw_lock = (
arch_rwlock_t) __ARCH
_RW_LOCK_UNLOCKED;
lock->magic = RWLOCK_MAGIC;
lock->owner = SPINLOCK_OWNER_INIT;
lock->owner_cpu = -1;
lock->magic = RWLOCK_MAGIC;
lock->owner = SPINLOCK_OWNER_INIT;
lock->owner_cpu = -1;
@@
-49,7
+49,7
@@
void __rwlock_init(rwlock_t *lock, const char *name,
EXPORT_SYMBOL(__rwlock_init);
EXPORT_SYMBOL(__rwlock_init);
-static void spin_bug(spinlock_t *lock, const char *msg)
+static void spin_bug(
raw_
spinlock_t *lock, const char *msg)
{
struct task_struct *owner = NULL;
{
struct task_struct *owner = NULL;
@@
-73,7
+73,7
@@
static void spin_bug(spinlock_t *lock, const char *msg)
#define SPIN_BUG_ON(cond, lock, msg) if (unlikely(cond)) spin_bug(lock, msg)
static inline void
#define SPIN_BUG_ON(cond, lock, msg) if (unlikely(cond)) spin_bug(lock, msg)
static inline void
-debug_spin_lock_before(spinlock_t *lock)
+debug_spin_lock_before(
raw_
spinlock_t *lock)
{
SPIN_BUG_ON(lock->magic != SPINLOCK_MAGIC, lock, "bad magic");
SPIN_BUG_ON(lock->owner == current, lock, "recursion");
{
SPIN_BUG_ON(lock->magic != SPINLOCK_MAGIC, lock, "bad magic");
SPIN_BUG_ON(lock->owner == current, lock, "recursion");
@@
-81,16
+81,16
@@
debug_spin_lock_before(spinlock_t *lock)
lock, "cpu recursion");
}
lock, "cpu recursion");
}
-static inline void debug_spin_lock_after(spinlock_t *lock)
+static inline void debug_spin_lock_after(
raw_
spinlock_t *lock)
{
lock->owner_cpu = raw_smp_processor_id();
lock->owner = current;
}
{
lock->owner_cpu = raw_smp_processor_id();
lock->owner = current;
}
-static inline void debug_spin_unlock(spinlock_t *lock)
+static inline void debug_spin_unlock(
raw_
spinlock_t *lock)
{
SPIN_BUG_ON(lock->magic != SPINLOCK_MAGIC, lock, "bad magic");
{
SPIN_BUG_ON(lock->magic != SPINLOCK_MAGIC, lock, "bad magic");
- SPIN_BUG_ON(!spin_is_locked(lock), lock, "already unlocked");
+ SPIN_BUG_ON(!
raw_
spin_is_locked(lock), lock, "already unlocked");
SPIN_BUG_ON(lock->owner != current, lock, "wrong owner");
SPIN_BUG_ON(lock->owner_cpu != raw_smp_processor_id(),
lock, "wrong CPU");
SPIN_BUG_ON(lock->owner != current, lock, "wrong owner");
SPIN_BUG_ON(lock->owner_cpu != raw_smp_processor_id(),
lock, "wrong CPU");
@@
-98,7
+98,7
@@
static inline void debug_spin_unlock(spinlock_t *lock)
lock->owner_cpu = -1;
}
lock->owner_cpu = -1;
}
-static void __spin_lock_debug(spinlock_t *lock)
+static void __spin_lock_debug(
raw_
spinlock_t *lock)
{
u64 i;
u64 loops = loops_per_jiffy * HZ;
{
u64 i;
u64 loops = loops_per_jiffy * HZ;
@@
-106,7
+106,7
@@
static void __spin_lock_debug(spinlock_t *lock)
for (;;) {
for (i = 0; i < loops; i++) {
for (;;) {
for (i = 0; i < loops; i++) {
- if (
__raw
_spin_trylock(&lock->raw_lock))
+ if (
arch
_spin_trylock(&lock->raw_lock))
return;
__delay(1);
}
return;
__delay(1);
}
@@
-125,17
+125,17
@@
static void __spin_lock_debug(spinlock_t *lock)
}
}
}
}
-void
_raw_spin_lock(
spinlock_t *lock)
+void
do_raw_spin_lock(raw_
spinlock_t *lock)
{
debug_spin_lock_before(lock);
{
debug_spin_lock_before(lock);
- if (unlikely(!
__raw
_spin_trylock(&lock->raw_lock)))
+ if (unlikely(!
arch
_spin_trylock(&lock->raw_lock)))
__spin_lock_debug(lock);
debug_spin_lock_after(lock);
}
__spin_lock_debug(lock);
debug_spin_lock_after(lock);
}
-int
_raw_spin_trylock(
spinlock_t *lock)
+int
do_raw_spin_trylock(raw_
spinlock_t *lock)
{
{
- int ret =
__raw
_spin_trylock(&lock->raw_lock);
+ int ret =
arch
_spin_trylock(&lock->raw_lock);
if (ret)
debug_spin_lock_after(lock);
if (ret)
debug_spin_lock_after(lock);
@@
-148,10
+148,10
@@
int _raw_spin_trylock(spinlock_t *lock)
return ret;
}
return ret;
}
-void
_raw_spin_unlock(
spinlock_t *lock)
+void
do_raw_spin_unlock(raw_
spinlock_t *lock)
{
debug_spin_unlock(lock);
{
debug_spin_unlock(lock);
-
__raw
_spin_unlock(&lock->raw_lock);
+
arch
_spin_unlock(&lock->raw_lock);
}
static void rwlock_bug(rwlock_t *lock, const char *msg)
}
static void rwlock_bug(rwlock_t *lock, const char *msg)
@@
-176,7
+176,7
@@
static void __read_lock_debug(rwlock_t *lock)
for (;;) {
for (i = 0; i < loops; i++) {
for (;;) {
for (i = 0; i < loops; i++) {
- if (
__raw
_read_trylock(&lock->raw_lock))
+ if (
arch
_read_trylock(&lock->raw_lock))
return;
__delay(1);
}
return;
__delay(1);
}
@@
-193,15
+193,15
@@
static void __read_lock_debug(rwlock_t *lock)
}
#endif
}
#endif
-void _raw_read_lock(rwlock_t *lock)
+void
do
_raw_read_lock(rwlock_t *lock)
{
RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
{
RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
-
__raw
_read_lock(&lock->raw_lock);
+
arch
_read_lock(&lock->raw_lock);
}
}
-int _raw_read_trylock(rwlock_t *lock)
+int
do
_raw_read_trylock(rwlock_t *lock)
{
{
- int ret =
__raw
_read_trylock(&lock->raw_lock);
+ int ret =
arch
_read_trylock(&lock->raw_lock);
#ifndef CONFIG_SMP
/*
#ifndef CONFIG_SMP
/*
@@
-212,10
+212,10
@@
int _raw_read_trylock(rwlock_t *lock)
return ret;
}
return ret;
}
-void _raw_read_unlock(rwlock_t *lock)
+void
do
_raw_read_unlock(rwlock_t *lock)
{
RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
{
RWLOCK_BUG_ON(lock->magic != RWLOCK_MAGIC, lock, "bad magic");
-
__raw
_read_unlock(&lock->raw_lock);
+
arch
_read_unlock(&lock->raw_lock);
}
static inline void debug_write_lock_before(rwlock_t *lock)
}
static inline void debug_write_lock_before(rwlock_t *lock)
@@
-251,7
+251,7
@@
static void __write_lock_debug(rwlock_t *lock)
for (;;) {
for (i = 0; i < loops; i++) {
for (;;) {
for (i = 0; i < loops; i++) {
- if (
__raw
_write_trylock(&lock->raw_lock))
+ if (
arch
_write_trylock(&lock->raw_lock))
return;
__delay(1);
}
return;
__delay(1);
}
@@
-268,16
+268,16
@@
static void __write_lock_debug(rwlock_t *lock)
}
#endif
}
#endif
-void _raw_write_lock(rwlock_t *lock)
+void
do
_raw_write_lock(rwlock_t *lock)
{
debug_write_lock_before(lock);
{
debug_write_lock_before(lock);
-
__raw
_write_lock(&lock->raw_lock);
+
arch
_write_lock(&lock->raw_lock);
debug_write_lock_after(lock);
}
debug_write_lock_after(lock);
}
-int _raw_write_trylock(rwlock_t *lock)
+int
do
_raw_write_trylock(rwlock_t *lock)
{
{
- int ret =
__raw
_write_trylock(&lock->raw_lock);
+ int ret =
arch
_write_trylock(&lock->raw_lock);
if (ret)
debug_write_lock_after(lock);
if (ret)
debug_write_lock_after(lock);
@@
-290,8
+290,8
@@
int _raw_write_trylock(rwlock_t *lock)
return ret;
}
return ret;
}
-void _raw_write_unlock(rwlock_t *lock)
+void
do
_raw_write_unlock(rwlock_t *lock)
{
debug_write_unlock(lock);
{
debug_write_unlock(lock);
-
__raw
_write_unlock(&lock->raw_lock);
+
arch
_write_unlock(&lock->raw_lock);
}
}