diff options
author | Davidlohr Bueso <davidlohr.bueso@hp.com> | 2013-07-24 14:25:17 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-07-25 17:21:24 -0400 |
commit | 2b4883972271f8d61de67aa365ade89dfff69db1 (patch) | |
tree | 6e53fa2c3ffc3a89ca83f02b8a11ce8574c070d9 | |
parent | ec83f425dbca47e19c6737e8e7db0d0924a5de1b (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>
-rw-r--r-- | kernel/mutex.c | 4 |
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, | |||
489 | 489 | ||
490 | mutex_set_owner(lock); | 490 | mutex_set_owner(lock); |
491 | mspin_unlock(MLOCK(lock), &node); | 491 | mspin_unlock(MLOCK(lock), &node); |
492 | goto done; | 492 | preempt_enable(); |
493 | return 0; | ||
493 | } | 494 | } |
494 | mspin_unlock(MLOCK(lock), &node); | 495 | mspin_unlock(MLOCK(lock), &node); |
495 | 496 | ||
@@ -596,7 +597,6 @@ skip_wait: | |||
596 | } | 597 | } |
597 | 598 | ||
598 | spin_unlock_mutex(&lock->wait_lock, flags); | 599 | spin_unlock_mutex(&lock->wait_lock, flags); |
599 | done: | ||
600 | preempt_enable(); | 600 | preempt_enable(); |
601 | return 0; | 601 | return 0; |
602 | 602 | ||