[tip:core/locking] mutex: Fix missing conditions to build mutex_spin_on_owner()

From: tip-bot for Frederic Weisbecker
Date: Thu Dec 03 2009 - 08:24:22 EST


Commit-ID: c08f782985eed9959438368e84ce1d7f2ed03d95
Gitweb: http://git.kernel.org/tip/c08f782985eed9959438368e84ce1d7f2ed03d95
Author: Frederic Weisbecker <fweisbec@xxxxxxxxx>
AuthorDate: Wed, 2 Dec 2009 20:49:17 +0100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 3 Dec 2009 11:50:11 +0100

mutex: Fix missing conditions to build mutex_spin_on_owner()

We don't need to build mutex_spin_on_owner() if we have
CONFIG_DEBUG_MUTEXES or CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES as
it won't be used under such configs.

Use CONFIG_MUTEX_SPIN_ON_OWNER as it gathers all the necessary
checks before building it.

Signed-off-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Acked-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
LKML-Reference: <1259783357-8542-2-git-send-regression-fweisbec@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
---
kernel/sched.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index 3c11ae0..ec0af1f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5481,7 +5481,7 @@ need_resched_nonpreemptible:
}
EXPORT_SYMBOL(schedule);

-#ifdef CONFIG_SMP
+#ifdef CONFIG_MUTEX_SPIN_ON_OWNER
/*
* Look out! "owner" is an entirely speculative pointer
* access and not reliable.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/