From patchwork Tue Dec 6 03:29:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong Zhang X-Patchwork-Id: 5502 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3581723E0C for ; Tue, 6 Dec 2011 03:29:55 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 132E8A1833C for ; Tue, 6 Dec 2011 03:29:55 +0000 (UTC) Received: by lagm6 with SMTP id m6so710217lag.11 for ; Mon, 05 Dec 2011 19:29:54 -0800 (PST) Received: by 10.152.104.103 with SMTP id gd7mr301581lab.34.1323142194737; Mon, 05 Dec 2011 19:29:54 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs294868lal; Mon, 5 Dec 2011 19:29:53 -0800 (PST) Received: by 10.50.181.202 with SMTP id dy10mr11543169igc.14.1323142191700; Mon, 05 Dec 2011 19:29:51 -0800 (PST) Received: from mail-iy0-f178.google.com (mail-iy0-f178.google.com [209.85.210.178]) by mx.google.com with ESMTPS id ui4si10774136icb.66.2011.12.05.19.29.51 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Dec 2011 19:29:51 -0800 (PST) Received-SPF: pass (google.com: domain of yong.zhang0@gmail.com designates 209.85.210.178 as permitted sender) client-ip=209.85.210.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of yong.zhang0@gmail.com designates 209.85.210.178 as permitted sender) smtp.mail=yong.zhang0@gmail.com; dkim=pass (test mode) header.i=@gmail.com Received: by iabn5 with SMTP id n5so701301iab.37 for ; Mon, 05 Dec 2011 19:29:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=Lruf/+DXO6l8lxe96vxDuxKQSKH86YXWMtHIi+q2M/w=; b=KR6nxFXKihc7kKEloFpgM/NVd7PDBhcLRexxM04Y4ouNl3SIyj13ZATTgT9N6BGljy lkB+Gde9cNNkdqdmOB6vgokhNQhdX6uhnP7BNIlJ5GEFmwJqtmU7pc5vBgmFsxaubmGt bSklDz03gEgIpkvlfNEYKbjsHOvYLkW09JwTI= Received: by 10.50.163.97 with SMTP id yh1mr13025770igb.37.1323142191069; Mon, 05 Dec 2011 19:29:51 -0800 (PST) Received: from localhost ([61.148.56.138]) by mx.google.com with ESMTPS id a2sm46637128igj.7.2011.12.05.19.29.39 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 05 Dec 2011 19:29:49 -0800 (PST) Date: Tue, 6 Dec 2011 11:29:33 +0800 From: Yong Zhang To: "Paul E. McKenney" Cc: linux-kernel@vger.kernel.org, mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@polymtl.ca, josh@joshtriplett.org, niv@us.ibm.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, Valdis.Kletnieks@vt.edu, dhowells@redhat.com, eric.dumazet@gmail.com, darren@dvhart.com, patches@linaro.org Subject: [PATCH 3/3] rcu: use rt_mutex_lock_irqdisabled() in rcu_boost() Message-ID: <20111206032933.GC17091@zhy> Reply-To: Yong Zhang References: <20111203183417.GA18914@linux.vnet.ibm.com> <1322937282-19846-7-git-send-email-paulmck@linux.vnet.ibm.com> <20111205091924.GA28117@zhy> <20111205164505.GB2326@linux.vnet.ibm.com> <20111206012635.GA32498@zhy> <20111206021227.GO2326@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20111206021227.GO2326@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Otherwise we will get false positive warning from might_sleep() Signed-off-by: Yong Zhang --- kernel/rcutree_plugin.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h index 2020e8a..489b1cd 100644 --- a/kernel/rcutree_plugin.h +++ b/kernel/rcutree_plugin.h @@ -1237,7 +1237,7 @@ static int rcu_boost(struct rcu_node *rnp) "rcu_boost_mutex"); t->rcu_boost_mutex = &mtx; raw_spin_unlock(&rnp->lock); /* rrupts remain disabled. */ - rt_mutex_lock(&mtx); /* Side effect: boosts task t's priority. */ + rt_mutex_lock_irqdisabled(&mtx); /* Side effect: boosts task t's priority. */ rt_mutex_unlock(&mtx); /* Keep lockdep happy. */ local_irq_restore(flags);