From e33658944cf8da2307b16bc9bc21107fe9047bc0 Mon Sep 17 00:00:00 2001 From: Jack Morgenstein Date: Sun, 13 May 2007 17:18:23 +0300 Subject: [PATCH] --- yaml --- r: 56401 b: refs/heads/master c: 26c6bc7b812b4157ba929035e467c0f4dd165916 h: refs/heads/master i: 56399: 6f80f1256739bb57e991e51414a836ae84749011 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mlx4/main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f226af47eab3..2bd325898070 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20eebcf09c2d329e4dcdd765634c0a524195e16d +refs/heads/master: 26c6bc7b812b4157ba929035e467c0f4dd165916 diff --git a/trunk/drivers/infiniband/hw/mlx4/main.c b/trunk/drivers/infiniband/hw/mlx4/main.c index 688ecb4c39f3..402f3a20ec0a 100644 --- a/trunk/drivers/infiniband/hw/mlx4/main.c +++ b/trunk/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);