Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd2efd03 authored by Dave Young's avatar Dave Young Committed by Marcel Holtmann
Browse files

Bluetooth: Remove CONFIG_DEBUG_LOCK_ALLOC ifdefs 



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

The following commit fixed the !lockdep build warnings:

commit e8f6fbf6
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: default avatarDave Young <hidave.darkstar@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 5f9018af

net/bluetooth/af_bluetooth.c

+0 −6
Original line number Diff line number Diff line
@@ -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_lock(struct socket *sock, int proto) 
			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)

{