2009-01-31 05:51:15

by Dave Young

Subject: [PATCH] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove

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

Signed-off-by: Dave Young <[email protected]>
---
net/bluetooth/af_bluetooth.c | 6 ------
1 file changed, 6 deletions(-)

diff -uprN a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
--- a/net/bluetooth/af_bluetooth.c 2009-01-31 13:38:45.000000000 +0800
+++ b/net/bluetooth/af_bluetooth.c 2009-01-31 13:38:58.000000000 +0800
@@ -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)
{

2009-01-31 12:23:10

by Marcel Holtmann

Subject: Re: [PATCH] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove

Hi Dave,

> 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
>
> Signed-off-by: Dave Young <[email protected]>

I push this one via my tree to Dave. Thanks.

Regards

Marcel