Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 07:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'locking/urgent' into locking/core, to pick up fixes

Browse Source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2018-09-10 10:16:22 +02:00
commit ce991095cc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/jump_label.c
View File

@ -678,7 +678,7 @@ jump_label_module_notify(struct notifier_block *self, unsigned long val,
case MODULE_STATE_COMING: case MODULE_STATE_COMING:
ret = jump_label_add_module(mod); ret = jump_label_add_module(mod);
if (ret) { 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); jump_label_del_module(mod);
} }
break; break;

3
kernel/locking/mutex.c
View File

@ -389,7 +389,7 @@ static bool __ww_mutex_wound(struct mutex *lock,
/* /*
* wake_up_process() paired with set_current_state() * wake_up_process() paired with set_current_state()
* inserts sufficient barriers to make sure @owner either sees * 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. * wakeup pending to re-read the wounded state.
*/ */
if (owner != current) 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_lock_common(lock, &waiter);
debug_mutex_add_waiter(lock, &waiter, current);
lock_contended(&lock->dep_map, ip); lock_contended(&lock->dep_map, ip);