summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Morgenstein <jackm@dev.mellanox.co.il>2007-05-13 17:18:23 +0300
committerRoland Dreier <rolandd@cisco.com>2007-05-14 13:02:58 -0700
commit26c6bc7b812b4157ba929035e467c0f4dd165916 (patch)
treef66e1ef0bf5427d2518cd611464580337bc83441
parent20eebcf09c2d329e4dcdd765634c0a524195e16d (diff)
downloadlinux-3.10-26c6bc7b812b4157ba929035e467c0f4dd165916.tar.gz
linux-3.10-26c6bc7b812b4157ba929035e467c0f4dd165916.tar.bz2
linux-3.10-26c6bc7b812b4157ba929035e467c0f4dd165916.zip
IB/mlx4: Fix uninitialized spinlock for 32-bit archs
uar_lock spinlock was used in mlx4_ib_cq_arm without being initialized (this only affects 32-bit archs, because uar_lock is not used on 64-bit archs and MLX4_INIT_DOORBELL_LOCK() is a NOP). Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/hw/mlx4/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 688ecb4c39f..402f3a20ec0 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -489,6 +489,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
ibdev->uar_map = ioremap(ibdev->priv_uar.pfn << PAGE_SHIFT, PAGE_SIZE);
if (!ibdev->uar_map)
goto err_uar;
+ MLX4_INIT_DOORBELL_LOCK(&ibdev->uar_lock);
INIT_LIST_HEAD(&ibdev->pgdir_list);
mutex_init(&ibdev->pgdir_mutex);