* [patch 2/2] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove
@ 2009-02-11 21:28 akpm
2009-02-12 1:52 ` Marcel Holtmann
0 siblings, 1 reply; 3+ messages in thread
From: akpm @ 2009-02-11 21:28 UTC (permalink / raw)
To: marcel; +Cc: linux-bluetooth, netdev, akpm, hidave.darkstar, mingo
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(-)
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)
{
_
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 2/2] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove
2009-02-11 21:28 [patch 2/2] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove akpm
@ 2009-02-12 1:52 ` Marcel Holtmann
2009-02-12 2:22 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Marcel Holtmann @ 2009-02-12 1:52 UTC (permalink / raw)
To: akpm; +Cc: linux-bluetooth, netdev, hidave.darkstar, mingo
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 2/2] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove
2009-02-12 1:52 ` Marcel Holtmann
@ 2009-02-12 2:22 ` Andrew Morton
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Morton @ 2009-02-12 2:22 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth, netdev, hidave.darkstar, mingo
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?
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-12 2:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-11 21:28 [patch 2/2] bluetooth: CONFIG_DEBUG_LOCK_ALLOC ifdefs remove akpm
2009-02-12 1:52 ` Marcel Holtmann
2009-02-12 2:22 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox