diff options
author | Arjan van de Ven <arjan@infradead.org> | 2006-03-21 01:33:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-21 01:33:17 -0500 |
commit | 4a3e2f711a00a1feb72ae12fdc749da10179d185 (patch) | |
tree | 76ced9d3270dea4b864da71fa1d4415d2e3c8b11 /net/bluetooth/rfcomm | |
parent | d4ccd08cdfa8d34f4d25b62041343c52fc79385f (diff) |
[NET] sem2mutex: net/
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/rfcomm')
-rw-r--r-- | net/bluetooth/rfcomm/core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 5b4253c61f62..e99010ce8bb2 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
@@ -37,6 +37,8 @@ | |||
37 | #include <linux/wait.h> | 37 | #include <linux/wait.h> |
38 | #include <linux/device.h> | 38 | #include <linux/device.h> |
39 | #include <linux/net.h> | 39 | #include <linux/net.h> |
40 | #include <linux/mutex.h> | ||
41 | |||
40 | #include <net/sock.h> | 42 | #include <net/sock.h> |
41 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
42 | #include <asm/unaligned.h> | 44 | #include <asm/unaligned.h> |
@@ -57,9 +59,9 @@ static unsigned int l2cap_mtu = RFCOMM_MAX_L2CAP_MTU; | |||
57 | 59 | ||
58 | static struct task_struct *rfcomm_thread; | 60 | static struct task_struct *rfcomm_thread; |
59 | 61 | ||
60 | static DECLARE_MUTEX(rfcomm_sem); | 62 | static DEFINE_MUTEX(rfcomm_mutex); |
61 | #define rfcomm_lock() down(&rfcomm_sem); | 63 | #define rfcomm_lock() mutex_lock(&rfcomm_mutex) |
62 | #define rfcomm_unlock() up(&rfcomm_sem); | 64 | #define rfcomm_unlock() mutex_unlock(&rfcomm_mutex) |
63 | 65 | ||
64 | static unsigned long rfcomm_event; | 66 | static unsigned long rfcomm_event; |
65 | 67 | ||