diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 15:23:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 15:23:36 +1000 |
| commit | 09b875007666766222da9c1798df0d4a8858ceaf (patch) | |
| tree | f99c101ac85ca856e52a17477664ec0c6edfb62d /include | |
| parent | 6ab13cf7947c774c60a037b5f01b7638d07ecf2e (diff) | |
| parent | e05c6daff0066a22c4f5dd2e7e3223288c9011bb (diff) | |
Merge commit 'semaphore-removal/semaphore-removal'
Conflicts:
drivers/net/ps3_gelic_wireless.c
drivers/scsi/qla2xxx/qla_attr.c
drivers/scsi/qla2xxx/qla_def.h
drivers/scsi/qla2xxx/qla_mbx.c
drivers/scsi/qla2xxx/qla_mid.c
drivers/scsi/qla2xxx/qla_os.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 ea13baa3851b..5ebc33d300d2 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 */ @@ -115,7 +116,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; @@ -657,8 +658,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); |