diff options
author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2007-11-15 18:23:25 -0500 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-01-25 17:15:26 -0500 |
commit | 2c45688faed1b19583c388694025e39001b68c8d (patch) | |
tree | 38555f579fbdf6c9d74899482abc754d1793c8d4 /drivers/infiniband/hw/ipath/ipath_kernel.h | |
parent | 727792da2bc22e2ce125faef84aeca3b3e2f4a90 (diff) |
IB/ipath: Convert ipath_eep_sem semaphore to a mutex
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Acked-by: Michael Albaugh <Michael.Albaugh@qlogic.com>
Tested-by: Arthur Jones <arthur.jones@qlogic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_kernel.h')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_kernel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h index bb1dc075f1d1..1ef82d6bf377 100644 --- a/drivers/infiniband/hw/ipath/ipath_kernel.h +++ b/drivers/infiniband/hw/ipath/ipath_kernel.h | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
42 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
43 | #include <linux/dma-mapping.h> | 43 | #include <linux/dma-mapping.h> |
44 | #include <linux/mutex.h> | ||
44 | #include <asm/io.h> | 45 | #include <asm/io.h> |
45 | #include <rdma/ib_verbs.h> | 46 | #include <rdma/ib_verbs.h> |
46 | 47 | ||
@@ -616,7 +617,7 @@ struct ipath_devdata { | |||
616 | /* control access to actual counters, timer */ | 617 | /* control access to actual counters, timer */ |
617 | spinlock_t ipath_eep_st_lock; | 618 | spinlock_t ipath_eep_st_lock; |
618 | /* control high-level access to EEPROM */ | 619 | /* control high-level access to EEPROM */ |
619 | struct semaphore ipath_eep_sem; | 620 | struct mutex ipath_eep_lock; |
620 | /* Below inc'd by ipath_snap_cntrs(), locked by ipath_eep_st_lock */ | 621 | /* Below inc'd by ipath_snap_cntrs(), locked by ipath_eep_st_lock */ |
621 | uint64_t ipath_traffic_wds; | 622 | uint64_t ipath_traffic_wds; |
622 | /* active time is kept in seconds, but logged in hours */ | 623 | /* active time is kept in seconds, but logged in hours */ |