Commit-ID: 2b4883972271f8d61de67aa365ade89dfff69db1 Gitweb: http://git.kernel.org/tip/2b4883972271f8d61de67aa365ade89dfff69db1 Author: Davidlohr Bueso <davidlohr.bueso@xxxxxx> AuthorDate: Wed, 24 Jul 2013 11:25:17 -0700 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Thu, 25 Jul 2013 23:21:24 +0200 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@xxxxxxxxx> Signed-off-by: Davidlohr Bueso <davidlohr.bueso@xxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- kernel/mutex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/mutex.c b/kernel/mutex.c index 386ad5d..98164a5 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; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|