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

Commit c0226027 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

mutex: Better control mutex adaptive spinning config 



Introduce CONFIG_MUTEX_SPIN_ON_OWNER so that we can centralize
in a single place the conditions that determine its definition
and use.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
LKML-Reference: <1259783357-8542-1-git-send-regression-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
parent fa1452e8

kernel/Kconfig.locks

+3 −0
Original line number Diff line number Diff line
@@ -197,3 +197,6 @@ config INLINE_WRITE_UNLOCK_IRQ 


config INLINE_WRITE_UNLOCK_IRQRESTORE

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE



config MUTEX_SPIN_ON_OWNER

	def_bool SMP && !DEBUG_MUTEXES && !HAVE_DEFAULT_NO_SPIN_MUTEXES

kernel/mutex.c

+2 −2
Original line number Diff line number Diff line
@@ -148,8 +148,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, 


	preempt_disable();

	mutex_acquire(&lock->dep_map, subclass, 0, ip);

#if defined(CONFIG_SMP) && !defined(CONFIG_DEBUG_MUTEXES) && \

    !defined(CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES)



#ifdef CONFIG_MUTEX_SPIN_ON_OWNER

	/*

	 * Optimistic spinning.

	 *