diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 17:56:50 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 17:56:50 +1100 |
| commit | ab264f1f3b259fe6751511d787d3833880388050 (patch) | |
| tree | 0bdcd1a1e9fba4b7a84aae43f9be6a4f908544d9 /include | |
| parent | c3113fe951e3ba9837a97c523af9f04c808f7fd3 (diff) | |
| parent | 9ac2f04936e1140d7a28a01b84e086458e191b49 (diff) | |
Merge commit 'semaphore-removal/semaphore-removal'
Conflicts:
net/9p/trans_virtio.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 46a43b721dd6..fd5e6a85c626 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -25,6 +25,7 @@ #ifndef __HCI_CORE_H #define __HCI_CORE_H +#include <linux/mutex.h> #include <net/bluetooth/hci.h> /* HCI upper protocols */ @@ -117,7 +118,7 @@ struct hci_dev { struct sk_buff *sent_cmd; struct sk_buff *reassembly[3]; - struct semaphore req_lock; + struct mutex req_lock; wait_queue_head_t req_wait_q; __u32 req_status; __u32 req_result; @@ -665,8 +666,8 @@ struct hci_sec_filter { #define HCI_REQ_PEND 1 #define HCI_REQ_CANCELED 2 -#define hci_req_lock(d) down(&d->req_lock) -#define hci_req_unlock(d) up(&d->req_lock) +#define hci_req_lock(d) mutex_lock(&d->req_lock) +#define hci_req_unlock(d) mutex_unlock(&d->req_lock) void hci_req_complete(struct hci_dev *hdev, int result); |