From: tip-bot for Cheng Jian <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:locking/core] locking/rwlocks: Fix comments
Date: Tue, 7 Nov 2017 03:34:10 -0800 [thread overview]
Message-ID: <tip-f791dd2589d7e217625d7e411621a5bac71cbf69@git.kernel.org> (raw)
In-Reply-To: <1509706788-152547-1-git-send-email-cj.chengjian@huawei.com>
Commit-ID: f791dd2589d7e217625d7e411621a5bac71cbf69
Gitweb: https://git.kernel.org/tip/f791dd2589d7e217625d7e411621a5bac71cbf69
Author: Cheng Jian <cj.chengjian@huawei.com>
AuthorDate: Fri, 3 Nov 2017 18:59:48 +0800
Committer: Ingo Molnar <mingo@kernel.org>
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 <cj.chengjian@huawei.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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 <mingo@kernel.org>
---
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
prev parent reply other threads:[~2017-11-07 11:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-03 10:59 [PATCH] lock/rwlock fix comment for rwlock Cheng Jian
2017-11-07 11:34 ` tip-bot for Cheng Jian [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-f791dd2589d7e217625d7e411621a5bac71cbf69@git.kernel.org \
--to=tipbot@zytor.com \
--cc=cj.chengjian@huawei.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®