linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / bluetooth / rfcomm / core.c

diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index e99010c..5b4253c 100644 (file)
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -37,8 +37,6 @@
 #include <linux/wait.h>
 #include <linux/device.h>
 #include <linux/net.h>
-#include <linux/mutex.h>
-
 #include <net/sock.h>
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>
@@ -59,9 +57,9 @@ static unsigned int l2cap_mtu = RFCOMM_MAX_L2CAP_MTU;
 
 static struct task_struct *rfcomm_thread;
 
-static DEFINE_MUTEX(rfcomm_mutex);
-#define rfcomm_lock()  mutex_lock(&rfcomm_mutex)
-#define rfcomm_unlock()        mutex_unlock(&rfcomm_mutex)
+static DECLARE_MUTEX(rfcomm_sem);
+#define rfcomm_lock()  down(&rfcomm_sem);
+#define rfcomm_unlock()        up(&rfcomm_sem);
 
 static unsigned long rfcomm_event;