From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757329AbdKGLhs (ORCPT ); Tue, 7 Nov 2017 06:37:48 -0500 Received: from terminus.zytor.com ([65.50.211.136]:45531 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753700AbdKGLhr (ORCPT ); Tue, 7 Nov 2017 06:37:47 -0500 Date: Tue, 7 Nov 2017 03:34:10 -0800 From: tip-bot for Cheng Jian Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, peterz@infradead.org, mingo@kernel.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, cj.chengjian@huawei.com Reply-To: linux-kernel@vger.kernel.org, cj.chengjian@huawei.com, tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org, mingo@kernel.org, peterz@infradead.org In-Reply-To: <1509706788-152547-1-git-send-email-cj.chengjian@huawei.com> References: <1509706788-152547-1-git-send-email-cj.chengjian@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] locking/rwlocks: Fix comments Git-Commit-ID: f791dd2589d7e217625d7e411621a5bac71cbf69 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: f791dd2589d7e217625d7e411621a5bac71cbf69 Gitweb: https://git.kernel.org/tip/f791dd2589d7e217625d7e411621a5bac71cbf69 Author: Cheng Jian AuthorDate: Fri, 3 Nov 2017 18:59:48 +0800 Committer: Ingo Molnar CommitDate: Tue, 7 Nov 2017 12:22:21 +0100 locking/rwlocks: Fix comments - fix the list of locking API headers in kernel/locking/spinlock.c - fix an #endif comment Signed-off-by: Cheng Jian Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: huawei.libin@huawei.com Cc: xiexiuqi@huawei.com Link: http://lkml.kernel.org/r/1509706788-152547-1-git-send-email-cj.chengjian@huawei.com Signed-off-by: Ingo Molnar --- include/linux/rwlock_api_smp.h | 2 +- kernel/locking/spinlock.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/rwlock_api_smp.h b/include/linux/rwlock_api_smp.h index 5b9b84b..86ebb4b 100644 --- a/include/linux/rwlock_api_smp.h +++ b/include/linux/rwlock_api_smp.h @@ -211,7 +211,7 @@ static inline void __raw_write_lock(rwlock_t *lock) LOCK_CONTENDED(lock, do_raw_write_trylock, do_raw_write_lock); } -#endif /* CONFIG_PREEMPT */ +#endif /* !CONFIG_GENERIC_LOCKBREAK || CONFIG_DEBUG_LOCK_ALLOC */ static inline void __raw_write_unlock(rwlock_t *lock) { diff --git a/kernel/locking/spinlock.c b/kernel/locking/spinlock.c index b963433..1fd1a75 100644 --- a/kernel/locking/spinlock.c +++ b/kernel/locking/spinlock.c @@ -30,7 +30,8 @@ #if !defined(CONFIG_GENERIC_LOCKBREAK) || defined(CONFIG_DEBUG_LOCK_ALLOC) /* * The __lock_function inlines are taken from - * include/linux/spinlock_api_smp.h + * spinlock : include/linux/spinlock_api_smp.h + * rwlock : include/linux/rwlock_api_smp.h */ #else