From: Andi Kleen <andi@firstfloor.org>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 02/13] sgi-xp: Use lockdep_assert_held
Date: Tue, 27 Mar 2012 17:47:06 -0700 [thread overview]
Message-ID: <1332895637-32572-3-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1332895637-32572-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
!spin_is_locked() is always true on a up build, so cannot
be used for assert. Replace with lockdep_assert_held.
I realize UP builds are not very likely for this driver,
but it's still better to fix it.
Acked-by: Robin Holt <holt@sgi.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
drivers/misc/sgi-xp/xpc_channel.c | 6 +++---
drivers/misc/sgi-xp/xpc_sn2.c | 2 +-
drivers/misc/sgi-xp/xpc_uv.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/misc/sgi-xp/xpc_channel.c b/drivers/misc/sgi-xp/xpc_channel.c
index 652593f..1655c21 100644
--- a/drivers/misc/sgi-xp/xpc_channel.c
+++ b/drivers/misc/sgi-xp/xpc_channel.c
@@ -28,7 +28,7 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
{
enum xp_retval ret;
- DBUG_ON(!spin_is_locked(&ch->lock));
+ lockdep_assert_held(&ch->lock);
if (!(ch->flags & XPC_C_OPENREQUEST) ||
!(ch->flags & XPC_C_ROPENREQUEST)) {
@@ -82,7 +82,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
struct xpc_partition *part = &xpc_partitions[ch->partid];
u32 channel_was_connected = (ch->flags & XPC_C_WASCONNECTED);
- DBUG_ON(!spin_is_locked(&ch->lock));
+ lockdep_assert_held(&ch->lock);
if (!(ch->flags & XPC_C_DISCONNECTING))
return;
@@ -758,7 +758,7 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
{
u32 channel_was_connected = (ch->flags & XPC_C_CONNECTED);
- DBUG_ON(!spin_is_locked(&ch->lock));
+ lockdep_assert_held(&ch->lock);
if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_DISCONNECTED))
return;
diff --git a/drivers/misc/sgi-xp/xpc_sn2.c b/drivers/misc/sgi-xp/xpc_sn2.c
index 7d71c04..9d3b113 100644
--- a/drivers/misc/sgi-xp/xpc_sn2.c
+++ b/drivers/misc/sgi-xp/xpc_sn2.c
@@ -1674,7 +1674,7 @@ xpc_teardown_msg_structures_sn2(struct xpc_channel *ch)
{
struct xpc_channel_sn2 *ch_sn2 = &ch->sn.sn2;
- DBUG_ON(!spin_is_locked(&ch->lock));
+ lockdep_assert_held(&ch->lock);
ch_sn2->remote_msgqueue_pa = 0;
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index 17bbacb..666b081 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -1181,7 +1181,7 @@ xpc_teardown_msg_structures_uv(struct xpc_channel *ch)
{
struct xpc_channel_uv *ch_uv = &ch->sn.uv;
- DBUG_ON(!spin_is_locked(&ch->lock));
+ lockdep_assert_held(&ch->lock);
kfree(ch_uv->cached_notify_gru_mq_desc);
ch_uv->cached_notify_gru_mq_desc = NULL;
--
1.7.7.6
next prev parent reply other threads:[~2012-03-28 0:47 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 0:47 spin-is-locked is evil patchkit v2 Andi Kleen
2012-03-28 0:47 ` [PATCH 01/13] block: use lockdep_assert_held for queue locking Andi Kleen
2012-03-30 10:33 ` Jens Axboe
2012-03-28 0:47 ` Andi Kleen [this message]
2012-03-28 0:47 ` [PATCH 03/13] ada152x: Remove broken usage of spin_is_locked Andi Kleen
2012-03-28 0:47 ` [PATCH 04/13] staging/zmem: Use lockdep_assert_held instead " Andi Kleen
2012-03-28 0:47 ` [PATCH 05/13] XFS: Fix lock ASSERT on UP Andi Kleen
2012-03-29 23:21 ` Christoph Hellwig
2012-03-29 23:52 ` Andi Kleen
2012-03-30 4:13 ` Dave Chinner
2012-03-30 14:04 ` Andi Kleen
2012-03-30 14:10 ` Christoph Hellwig
2012-04-19 21:31 ` Andrew Morton
2012-03-28 0:47 ` [PATCH 06/13] huge-memory: Use lockdep_assert_held Andi Kleen
2012-03-28 0:47 ` [PATCH 07/13] futex: Use lockdep_assert_held() for lock checking Andi Kleen
2012-03-28 0:47 ` [PATCH 08/13] irda: remove spin_is_locked Andi Kleen
2012-03-28 1:32 ` David Miller
2012-03-28 0:47 ` [PATCH 09/13] usb: gadget: f_fs: Remove lock is held before freeing checks Andi Kleen
2012-04-10 10:42 ` Felipe Balbi
2012-03-28 0:47 ` [PATCH 10/13] smsc911x: Use lockdep_assert_held instead of home grown buggy construct Andi Kleen
2012-03-28 1:32 ` David Miller
2012-03-28 0:47 ` [PATCH 11/13] Add a discussion on why spin_is_locked() is bad to spinlocks.txt Andi Kleen
2012-03-28 8:48 ` Wolfram Sang
2012-03-28 9:07 ` Andi Kleen
2012-03-28 0:47 ` [PATCH 12/13] Add a kerneldoc comment to spin_is_locked() that discourages its usage Andi Kleen
2012-03-28 8:49 ` Wolfram Sang
2012-03-28 0:47 ` [PATCH 13/13] checkpatch: Check for spin_is_locked Andi Kleen
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=1332895637-32572-3-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.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
Powered by JetHome