From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966389AbbBDOjM (ORCPT ); Wed, 4 Feb 2015 09:39:12 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38851 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934013AbbBDOjI (ORCPT ); Wed, 4 Feb 2015 09:39:08 -0500 Date: Wed, 4 Feb 2015 06:38:22 -0800 From: tip-bot for Davidlohr Bueso Message-ID: Cc: linux-kernel@vger.kernel.org, jason.low2@hp.com, paulmck@linux.vnet.ibm.com, dave@stgolabs.net, tglx@linutronix.de, torvalds@linux-foundation.org, dbueso@suse.de, hpa@zytor.com, peterz@infradead.org, walken@google.com, tim.c.chen@linux.intel.com, mingo@kernel.org Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, tim.c.chen@linux.intel.com, walken@google.com, peterz@infradead.org, dbueso@suse.de, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, jason.low2@hp.com, dave@stgolabs.net, paulmck@linux.vnet.ibm.com In-Reply-To: <1422257769-14083-2-git-send-email-dave@stgolabs.net> References: <1422257769-14083-2-git-send-email-dave@stgolabs.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] locking/rwsem: Use task->state helpers Git-Commit-ID: 73105994c57d06e40a33ab5a716db04e898b4c05 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 73105994c57d06e40a33ab5a716db04e898b4c05 Gitweb: http://git.kernel.org/tip/73105994c57d06e40a33ab5a716db04e898b4c05 Author: Davidlohr Bueso AuthorDate: Sun, 25 Jan 2015 23:36:04 -0800 Committer: Ingo Molnar CommitDate: Wed, 4 Feb 2015 07:57:39 +0100 locking/rwsem: Use task->state helpers Call __set_task_state() instead of assigning the new state directly. These interfaces also aid CONFIG_DEBUG_ATOMIC_SLEEP environments, keeping track of who last changed the state. Signed-off-by: Davidlohr Bueso Signed-off-by: Peter Zijlstra (Intel) Cc: "Paul E. McKenney" Cc: Jason Low Cc: Michel Lespinasse Cc: Tim Chen Cc: Linus Torvalds Link: http://lkml.kernel.org/r/1422257769-14083-2-git-send-email-dave@stgolabs.net Signed-off-by: Ingo Molnar --- kernel/locking/rwsem-spinlock.c | 2 +- kernel/locking/rwsem-xadd.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/locking/rwsem-spinlock.c b/kernel/locking/rwsem-spinlock.c index 2c93571..2555ae1 100644 --- a/kernel/locking/rwsem-spinlock.c +++ b/kernel/locking/rwsem-spinlock.c @@ -154,7 +154,7 @@ void __sched __down_read(struct rw_semaphore *sem) set_task_state(tsk, TASK_UNINTERRUPTIBLE); } - tsk->state = TASK_RUNNING; + __set_task_state(tsk, TASK_RUNNING); out: ; } diff --git a/kernel/locking/rwsem-xadd.c b/kernel/locking/rwsem-xadd.c index 7628c3f..2f7cc40 100644 --- a/kernel/locking/rwsem-xadd.c +++ b/kernel/locking/rwsem-xadd.c @@ -242,8 +242,7 @@ struct rw_semaphore __sched *rwsem_down_read_failed(struct rw_semaphore *sem) schedule(); } - tsk->state = TASK_RUNNING; - + __set_task_state(tsk, TASK_RUNNING); return sem; } EXPORT_SYMBOL(rwsem_down_read_failed);