[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1399590437-5548-1-git-send-email-emilgoode@gmail.com>
Date: Fri, 9 May 2014 01:07:17 +0200
From: Emil Goode <emilgoode@...il.com>
To: "David S. Miller" <davem@...emloft.net>,
Jingoo Han <jg1.han@...sung.com>,
Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
Ben Hutchings <ben@...adent.org.uk>,
Arend van Spriel <arend@...adcom.com>,
Joe Perches <joe@...ches.com>
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org, Emil Goode <emilgoode@...il.com>
Subject: [PATCH] net: cassini: use nested lock annotation
In the cas_lock_tx function we acquire multiple locks in a loop and
need to use nested lock annotation to prevent lockdep warnings.
Reported-by: Meelis Roos <mroos@...ux.ee>
Signed-off-by: Emil Goode <emilgoode@...il.com>
---
drivers/net/ethernet/sun/cassini.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index df8d383..b9ac20f 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -246,7 +246,7 @@ static inline void cas_lock_tx(struct cas *cp)
int i;
for (i = 0; i < N_TX_RINGS; i++)
- spin_lock(&cp->tx_lock[i]);
+ spin_lock_nested(&cp->tx_lock[i], i);
}
static inline void cas_lock_all(struct cas *cp)
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists