Skip to contentSkip to conversation

bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove

PATCH In review akpm-de/[email protected] 3 participants 3 messages Feb 11, 2009 – Feb 12, 2009 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove

From: Dave Young <[email protected]>

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 <[email protected]>
Date:   Wed Nov 12 01:38:36 2008 +0000

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

---

 net/bluetooth/af_bluetooth.c |    6 ------
 1 file changed, 6 deletions(-)
net/bluetooth/af_bluetooth.c renamed from net/bluetooth/af_bluetooth.c~bluetooth-config_debug_lock_alloc-ifdefs-remove +0 -6
diff -puN net/bluetooth/af_bluetooth.c~bluetooth-config_debug_lock_alloc-ifdefs-remove 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)
 {

_

A message that is not in the archive (sent off-list or not yet received): 200902112128.n1BLSCdw000376-AB4EexQrvXRQetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org

#2 lore raw

Hi Andrew,

Quoted 4 lines

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

#3 lore raw
Quoted 9 lines · On Thu, 12 Feb 2009 02:52:38 +0100 Marcel Holtmann <[email protected]> wrote:

Hi Andrew,

Quoted 4 lines

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?