Merge Linus' tree to be be to apply submitted patches to newer code than

current trivial.git base

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/locking/mutex.h b/kernel/locking/mutex.h
index 4115fbf83b1..5cda397607f 100644
--- a/kernel/locking/mutex.h
+++ b/kernel/locking/mutex.h
@@ -16,7 +16,7 @@
 #define mutex_remove_waiter(lock, waiter, ti) \
 		__list_del((waiter)->list.prev, (waiter)->list.next)
 
-#ifdef CONFIG_SMP
+#ifdef CONFIG_MUTEX_SPIN_ON_OWNER
 static inline void mutex_set_owner(struct mutex *lock)
 {
 	lock->owner = current;