summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDavidlohr Bueso <davidlohr.bueso@hp.com>2013-07-24 11:25:17 -0700
committerIngo Molnar <mingo@kernel.org>2013-07-25 23:21:24 +0200
commit2b4883972271f8d61de67aa365ade89dfff69db1 (patch)
tree6e53fa2c3ffc3a89ca83f02b8a11ce8574c070d9 /kernel
parentec83f425dbca47e19c6737e8e7db0d0924a5de1b (diff)
mutex: Avoid label warning when !CONFIG_MUTEX_SPIN_ON_OWNER
Fengguang reported the following warning when optimistic spinning is disabled (ie: make allnoconfig): kernel/mutex.c:599:1: warning: label 'done' defined but not used Remove the 'done' label altogether. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Davidlohr Bueso <davidlohr.bueso@hp.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/mutex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 386ad5da47a5..98164a55a4dc 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -489,7 +489,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
mutex_set_owner(lock);
mspin_unlock(MLOCK(lock), &node);
- goto done;
+ preempt_enable();
+ return 0;
}
mspin_unlock(MLOCK(lock), &node);
@@ -596,7 +597,6 @@ skip_wait:
}
spin_unlock_mutex(&lock->wait_lock, flags);
-done:
preempt_enable();
return 0;