Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751450AbcCHWGV (ORCPT ); Tue, 8 Mar 2016 17:06:21 -0500 Received: from mx2.suse.de ([195.135.220.15]:34421 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751238AbcCHWFu (ORCPT ); Tue, 8 Mar 2016 17:05:50 -0500 Date: Tue, 8 Mar 2016 14:05:39 -0800 From: Davidlohr Bueso To: tglx@linutronix.de, mingo@kernel.org Cc: peterz@infradead.org, bigeasy@linutronix.de, umgwanakikbuti@gmail.com, paulmck@linux.vnet.ibm.com, dave@stgolabs.net, linux-kernel@vger.kernel.org Subject: [PATCH 4/3] rtmutex: Avoid barrier in rt_mutex_handle_deadlock Message-ID: <20160308220539.GB4404@linux-uzut.site> References: <1457461223-4301-1-git-send-email-dave@stgolabs.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <1457461223-4301-1-git-send-email-dave@stgolabs.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 826 Lines: 25 The very nature of rt_mutex_handle_deadlock() implies that this patch is merely a formality, as in practice the saved barrier is of little use. That said, we can relax setting the task state and be done with it; blocking unconditionally... this is a deadlock! Signed-off-by: Davidlohr Bueso --- kernel/locking/rtmutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c index 8eb99b7f1ac8..c3d3c8e8ea5c 100644 --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1216,7 +1216,7 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock, */ rt_mutex_print_deadlock(w); while (1) { - set_current_state(TASK_INTERRUPTIBLE); + __set_current_state(TASK_INTERRUPTIBLE); schedule(); } } -- 2.1.4