2009-02-11 21:28:12

by Andrew Morton

Subject: [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

Signed-off-by: Dave Young <[email protected]>
Cc: Marcel Holtmann <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---

net/bluetooth/af_bluetooth.c | 6 ------
1 file changed, 6 deletions(-)

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)
{
_

2009-02-12 02:22:53

by Andrew Morton

Subject: Re: [patch 2/2] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove

On Thu, 12 Feb 2009 02:52:38 +0100 Marcel Holtmann <[email protected]> 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?

2009-02-12 01:52:38

by Marcel Holtmann

Subject: Re: [patch 2/2] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove

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