Patchwork [2/2] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove

login
register
mail settings
Submitter Andrew Morton
Date Feb. 11, 2009, 9:28 p.m.
Message ID <200902112128.n1BLSCdw000376@imap1.linux-foundation.org>
Download mbox | patch
Permalink /patch/22960/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Andrew Morton - Feb. 11, 2009, 9:28 p.m.
From: Dave Young <hidave.darkstar@gmail.com>

Due to lockdep changes the CONFIG_DEBUG_LOCK_ALLOC ifdef is not needed
now, just remove it here.

The following commit fixed the !lockdep build warnings:

commit e8f6fbf62de37cbc2e179176ac7010d5f4396b67
Author: Ingo Molnar <mingo@elte.hu>
Date:   Wed Nov 12 01:38:36 2008 +0000

    lockdep: include/linux/lockdep.h - fix warning in net/bluetooth/af_bluetooth.c

Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/bluetooth/af_bluetooth.c |    6 ------
 1 file changed, 6 deletions(-)
Marcel Holtmann - Feb. 12, 2009, 1:52 a.m.
Hi Andrew,

> Due to lockdep changes the CONFIG_DEBUG_LOCK_ALLOC ifdef is not needed
> now, just remove it here.
> 
> The following commit fixed the !lockdep build warnings:

already part of my bluetooth-testing.git tree.

Regards

Marcel


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Andrew Morton - Feb. 12, 2009, 2:22 a.m.
On Thu, 12 Feb 2009 02:52:38 +0100 Marcel Holtmann <marcel@holtmann.org> wrote:

> Hi Andrew,
> 
> > Due to lockdep changes the CONFIG_DEBUG_LOCK_ALLOC ifdef is not needed
> > now, just remove it here.
> > 
> > The following commit fixed the !lockdep build warnings:
> 
> already part of my bluetooth-testing.git tree.
> 

Well, I have no way of knowing this, because that tree is not
in linux-next.

Please get it added?
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff -puN net/bluetooth/af_bluetooth.c~bluetooth-config_debug_lock_alloc-ifdefs-remove net/bluetooth/af_bluetooth.c
--- a/net/bluetooth/af_bluetooth.c~bluetooth-config_debug_lock_alloc-ifdefs-remove
+++ a/net/bluetooth/af_bluetooth.c
@@ -48,7 +48,6 @@ 
 static struct net_proto_family *bt_proto[BT_MAX_PROTO];
 static DEFINE_RWLOCK(bt_proto_lock);
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
 static struct lock_class_key bt_lock_key[BT_MAX_PROTO];
 static const char *bt_key_strings[BT_MAX_PROTO] = {
 	"sk_lock-AF_BLUETOOTH-BTPROTO_L2CAP",
@@ -86,11 +85,6 @@  static inline void bt_sock_reclassify_lo
 			bt_slock_key_strings[proto], &bt_slock_key[proto],
 				bt_key_strings[proto], &bt_lock_key[proto]);
 }
-#else
-static inline void bt_sock_reclassify_lock(struct socket *sock, int proto)
-{
-}
-#endif
 
 int bt_sock_register(int proto, struct net_proto_family *ops)
 {