diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-11 11:46:31 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-11 11:46:31 -0800 |
commit | 1e6c3e8f8fb94a8914a380e02a7e8ad81d47273e (patch) | |
tree | 02630107e059e9834d53dee4ff86cf806a9eec2e /kernel | |
parent | b800c91a0517071156e772d4fb329ad33590da62 (diff) | |
parent | 8e654dd68f95ac5f990ed21b2b31967dacbe563f (diff) | |
download | linux-1e6c3e8f8fb94a8914a380e02a7e8ad81d47273e.tar.bz2 |
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar:
"A liblockdep fix and a mutex_unlock() mutex-debugging fix"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
mutex: Always clear owner field upon mutex_unlock()
tools/liblockdep: Fix debug_check thinko in mutex destroy
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/locking/mutex-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c index 5cf6731b98e9..3ef3736002d8 100644 --- a/kernel/locking/mutex-debug.c +++ b/kernel/locking/mutex-debug.c @@ -80,13 +80,13 @@ void debug_mutex_unlock(struct mutex *lock) DEBUG_LOCKS_WARN_ON(lock->owner != current); DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); - mutex_clear_owner(lock); } /* * __mutex_slowpath_needs_to_unlock() is explicitly 0 for debug * mutexes so that we can do it here after we've verified state. */ + mutex_clear_owner(lock); atomic_set(&lock->count, 1); } |