diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:50:34 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:50:34 -0400 |
commit | a208f37a465e222218974ab20a31b42b7b4893b2 (patch) | |
tree | 77c6acdd4be32024330a14f2618b814126ce7a20 /kernel/mutex-debug.c | |
parent | 511d9d34183662aada3890883e860b151d707e22 (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'kernel/mutex-debug.c')
-rw-r--r-- | kernel/mutex-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c index 3aaa06c561de..1d94160eb532 100644 --- a/kernel/mutex-debug.c +++ b/kernel/mutex-debug.c | |||
@@ -79,8 +79,8 @@ void debug_mutex_unlock(struct mutex *lock) | |||
79 | if (unlikely(!debug_locks)) | 79 | if (unlikely(!debug_locks)) |
80 | return; | 80 | return; |
81 | 81 | ||
82 | DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info()); | ||
83 | DEBUG_LOCKS_WARN_ON(lock->magic != lock); | 82 | DEBUG_LOCKS_WARN_ON(lock->magic != lock); |
83 | DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info()); | ||
84 | DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); | 84 | DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); |
85 | DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info()); | 85 | DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info()); |
86 | } | 86 | } |