From: Davidlohr Bueso <davidlohr.bueso@hp.com>
Date: Wed, 24 Jul 2013 18:25:17 +0000 (-0700)
Subject: mutex: Avoid label warning when !CONFIG_MUTEX_SPIN_ON_OWNER
X-Git-Tag: upstream/snapshot3+hdmi~4459^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=2b4883972271f8d61de67aa365ade89dfff69db1;hp=ec83f425dbca47e19c6737e8e7db0d0924a5de1b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

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;