summaryrefslogtreecommitdiff
path: root/kernel/mutex.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-07-03 00:24:30 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 15:27:01 -0700
commit9e7f4d451e99b7592a96ad0efaf8bcc1e7b2f854 (patch)
treebc61ead5d497222f93acebbb5cbe1debf6b758ee /kernel/mutex.c
parent61f4c3d6db3ecbdd4e1a2a7a1710c1410d085dd1 (diff)
[PATCH] lockdep: rename DEBUG_WARN_ON()
Rename DEBUG_WARN_ON() to the less generic DEBUG_LOCKS_WARN_ON() name, so that it's clear that this is a lock-debugging internal mechanism. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/mutex.c')
-rw-r--r--kernel/mutex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 7043db21bbce..101ceeb38925 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -183,8 +183,8 @@ __mutex_lock_common(struct mutex *lock, long state __IP_DECL__)
debug_mutex_free_waiter(&waiter);
- DEBUG_WARN_ON(list_empty(&lock->held_list));
- DEBUG_WARN_ON(lock->owner != task->thread_info);
+ DEBUG_LOCKS_WARN_ON(list_empty(&lock->held_list));
+ DEBUG_LOCKS_WARN_ON(lock->owner != task->thread_info);
return 0;
}
@@ -206,7 +206,7 @@ __mutex_unlock_slowpath(atomic_t *lock_count __IP_DECL__)
struct mutex *lock = container_of(lock_count, struct mutex, count);
unsigned long flags;
- DEBUG_WARN_ON(lock->owner != current_thread_info());
+ DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
spin_lock_mutex(&lock->wait_lock, flags);