diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-12-02 20:49:16 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-03 11:50:11 +0100 |
| commit | c02260277e472095ffb3ad893be5eeab9dcefde3 (patch) | |
| tree | 583bb881a47b02cf345c557722696e96f609e690 | |
| parent | fa1452e808732ae10e8b1267fd75fc2d028d634b (diff) | |
| download | linux-c02260277e472095ffb3ad893be5eeab9dcefde3.tar.gz linux-c02260277e472095ffb3ad893be5eeab9dcefde3.tar.bz2 linux-c02260277e472095ffb3ad893be5eeab9dcefde3.zip | |
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: Frederic Weisbecker <fweisbec@gmail.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1259783357-8542-1-git-send-regression-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
| -rw-r--r-- | kernel/Kconfig.locks | 3 | ||||
| -rw-r--r-- | kernel/mutex.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks index d1f86db71451..88c92fb44618 100644 --- a/kernel/Kconfig.locks +++ b/kernel/Kconfig.locks @@ -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 diff --git a/kernel/mutex.c b/kernel/mutex.c index 947b3ad551f8..632f04c57d82 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c @@ -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. * |