lkml.org 
[lkml]   [2014]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
SubjectRE: [PATCH] sgi-xp: Do not use BUG_ON(!spin_is_locked())
Date
Hello Robin,

Who will merge the change in linux-next tree.

Regards
Sanjeev Sharma

-----Original Message-----
From: Sanjeev Sharma [mailto:sanjeev_sharma@mentor.com]
Sent: Tuesday, August 12, 2014 1:05 PM
To: cpw@sgi.com; robinmholt@gmail.com
Cc: linux-kernel@vger.kernel.org; Sharma, Sanjeev; Sharma, Sanjeev
Subject: [PATCH] sgi-xp: Do not use BUG_ON(!spin_is_locked())

on some architecture spin_is_locked() always return false in uniprocessor configuration and can therefore not be used with BUG_ON.it would be advise to replace with lockdep_assert_held().

Signed-off-by: Sanjeev Sharma <Sanjeev_Sharma@mentor.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 128d561..240fe5a 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(!spin_is_locked(&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(!spin_is_locked(&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(!spin_is_locked(&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..f90ee26 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(!spin_is_locked(&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 95c8944..a349940 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -1183,7 +1183,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(!spin_is_locked(&ch->lock));

kfree(ch_uv->cached_notify_gru_mq_desc);
ch_uv->cached_notify_gru_mq_desc = NULL;
--
1.7.11.7


\
 
 \ /
  Last update: 2014-08-19 09:21    [W:0.063 / U:1.904 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site