diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 00:55:14 -0400 |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /kernel/mutex-debug.c | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
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 | } |