From: Yevgeny Petrilin Date: Mon, 19 Dec 2011 04:03:05 +0000 (+0000) Subject: mlx4: not using spin_lock_irq when getting vf by resource. X-Git-Tag: v3.12-rc1~4160^2~174 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=996b0541e73a3321947dbc8894a078b8e82e8691;p=kernel%2Fkernel-generic.git mlx4: not using spin_lock_irq when getting vf by resource. The function is always called from irq context, changing the call to spin_lock(). Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index bdd61c3..b41762d 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -339,14 +339,14 @@ int mlx4_get_slave_from_resource_id(struct mlx4_dev *dev, if (type == RES_QP) id &= 0x7fffff; - spin_lock_irq(mlx4_tlock(dev)); + spin_lock(mlx4_tlock(dev)); r = find_res(dev, id, type); if (r) { *slave = r->owner; err = 0; } - spin_unlock_irq(mlx4_tlock(dev)); + spin_unlock(mlx4_tlock(dev)); return err; }