Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce991095 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 34e12b86 da260fe1

kernel/jump_label.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

kernel/locking/mutex.c

+1 −2
Original line number Diff line number Diff line
@@ -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);