From patchwork Mon Dec 19 14:03:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Petrilin X-Patchwork-Id: 132281 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 91481B6FED for ; Tue, 20 Dec 2011 03:17:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752382Ab1LSQRl (ORCPT ); Mon, 19 Dec 2011 11:17:41 -0500 Received: from eu1sys200aog114.obsmtp.com ([207.126.144.137]:47141 "HELO eu1sys200aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752062Ab1LSQRj (ORCPT ); Mon, 19 Dec 2011 11:17:39 -0500 Received: from MTLCAS01.mtl.com ([194.90.237.34]) (using TLSv1) by eu1sys200aob114.postini.com ([207.126.147.11]) with SMTP ID DSNKTu9joBGwSFEuLah+gDnAdZfptPBhCcmp@postini.com; Mon, 19 Dec 2011 16:17:38 UTC Received: from vnc2.lab.mtl.com (10.4.45.2) by MTLCAS01.mtl.com (10.0.8.70) with Microsoft SMTP Server id 14.1.289.1; Mon, 19 Dec 2011 18:07:20 +0200 Message-ID: <4EEF4419.100@mellanox.co.il> Date: Mon, 19 Dec 2011 16:03:05 +0200 From: Yevgeny Petrilin User-Agent: Thunderbird 2.0.0.17 (X11/20080914) MIME-Version: 1.0 To: CC: , Subject: [PATCH net-next 4/5] mlx4: not using spin_lock_irq when getting vf by resource. X-Originating-IP: [10.4.45.2] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Yevgeny Petrilin The function is always called from irq context, changing the call to spin_lock(). Signed-off-by: Yevgeny Petrilin --- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 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; }