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

Commit 3b6c5507 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  mutex: Improve the scalability of optimistic spinning
parents 8ca3eb08 9d0f4dcc

kernel/sched.c

+9 −1
Original line number Diff line number Diff line
@@ -3865,8 +3865,16 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner) 
		/*

		 * Owner changed, break to re-assess state.

		 */

		if (lock->owner != owner)

		if (lock->owner != owner) {

			/*

			 * If the lock has switched to a different owner,

			 * we likely have heavy contention. Return 0 to quit

			 * optimistic spinning and not contend further:

			 */

			if (lock->owner)

				return 0;

			break;

		}



		/*

		 * Is that owner really running on that cpu?