diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-09-10 11:16:22 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-09-10 11:16:22 +0300 |
| commit | ce991095ccdf83ab4af7b4f5de0c8d3306fb97bf (patch) | |
| tree | 72b1188ce2cb024e66d92286011c45221bff666e /kernel | |
| parent | 34e12b864e617ca7e4f6a3108460aa143bf20056 (diff) | |
| parent | da260fe12330be8b003c2ab07a112704163ea675 (diff) | |
| download | linux-ce991095ccdf83ab4af7b4f5de0c8d3306fb97bf.tar.xz | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/jump_label.c | 2 | ||||
| -rw-r--r-- | kernel/locking/mutex.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c index 61d1c0178731..de97d8753b62 100644 --- a/kernel/jump_label.c +++ b/kernel/jump_label.c @@ -678,7 +678,7 @@ jump_label_module_notify(struct notifier_block *self, unsigned long val, case MODULE_STATE_COMING: ret = jump_label_add_module(mod); if (ret) { - WARN(1, "Failed to allocatote memory: jump_label may not work properly.\n"); + WARN(1, "Failed to allocate memory: jump_label may not work properly.\n"); jump_label_del_module(mod); } break; diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 1a81a1257b3f..3f8a35104285 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -389,7 +389,7 @@ static bool __ww_mutex_wound(struct mutex *lock, /* * wake_up_process() paired with set_current_state() * inserts sufficient barriers to make sure @owner either sees - * it's wounded in __ww_mutex_lock_check_stamp() or has a + * it's wounded in __ww_mutex_check_kill() or has a * wakeup pending to re-read the wounded state. */ if (owner != current) @@ -946,7 +946,6 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, } debug_mutex_lock_common(lock, &waiter); - debug_mutex_add_waiter(lock, &waiter, current); lock_contended(&lock->dep_map, ip); |